diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java index 4497684f3..aabf6fa68 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java @@ -28,7 +28,6 @@ import com.pig4cloud.pigx.codegen.entity.GenDatasourceConf; import com.pig4cloud.pigx.codegen.service.GenDatasourceConfService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.core.util.SpringContextHolder; -import com.pig4cloud.pigx.common.security.annotation.Inner; import com.pig4cloud.pigx.common.xss.core.XssCleanIgnore; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; @@ -72,7 +71,6 @@ public class GenDsConfController { * @return */ @GetMapping("/list") - @Inner(value = false) public R list() { return R.ok(datasourceConfService.list()); } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GenTableService.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GenTableService.java index acfe10ba2..88521b526 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GenTableService.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GenTableService.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.codegen.entity.GenTable; +import org.anyline.metadata.Column; import org.anyline.metadata.Table; import java.util.List; @@ -68,7 +69,7 @@ public interface GenTableService extends IService { * @param dsName 数据源名称 * @return table */ - List queryTableList(String dsName); + List queryTableList(String dsName); /** * 查询表的全部字段 @@ -77,6 +78,6 @@ public interface GenTableService extends IService { * @param tableName 表名称 * @return column */ - List queryTableColumn(String dsName, String tableName); + List queryTableColumn(String dsName, String tableName); } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java index cb589b4e5..647a23110 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java @@ -99,11 +99,11 @@ public class GenTableServiceImpl extends ServiceImpl i * @return column */ @Override - public List queryTableColumn(String dsName, String tableName) { + public List queryTableColumn(String dsName, String tableName) { // 手动切换数据源 DynamicDataSourceContextHolder.push(dsName); CacheProxy.clear(); - return ServiceProxy.metadata().columns(tableName).values().stream().map(Column::getName).toList(); + return ServiceProxy.metadata().columns(tableName).values().stream().toList(); } /** @@ -151,11 +151,11 @@ public class GenTableServiceImpl extends ServiceImpl i * @return table */ @Override - public List queryTableList(String dsName) { + public List
queryTableList(String dsName) { // 手动切换数据源 DynamicDataSourceContextHolder.push(dsName); CacheProxy.clear(); - return ServiceProxy.metadata().tables().values().stream().map(Table::getName).toList(); + return ServiceProxy.metadata().tables().values().stream().toList(); } /**