From 1f42bd3d22c104aaa2d780c20a555b5e467858bf Mon Sep 17 00:00:00 2001 From: MichelleChung <1242874891@qq.com> Date: 星期一, 07 十一月 2022 22:10:52 +0800 Subject: [PATCH] !245 数据源由 Druid 修改为 Hikari * update 更新 dataSource 数据源, 由 druid 修改为 hikari, 更新相关配置 ; --- ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java index 1bf0c27..c432d06 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java @@ -1,8 +1,9 @@ package com.ruoyi.generator.service; -import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.generator.domain.GenTable; +import com.ruoyi.generator.domain.GenTableColumn; import java.util.List; import java.util.Map; @@ -12,13 +13,15 @@ * * @author Lion Li */ -public interface IGenTableService extends IService<GenTable> { +public interface IGenTableService { - - TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable); - - - TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable); + /** + * 鏌ヨ涓氬姟瀛楁鍒楄〃 + * + * @param tableId 涓氬姟瀛楁缂栧彿 + * @return 涓氬姟瀛楁闆嗗悎 + */ + List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId); /** * 鏌ヨ涓氬姟鍒楄〃 @@ -26,7 +29,7 @@ * @param genTable 涓氬姟淇℃伅 * @return 涓氬姟闆嗗悎 */ - List<GenTable> selectGenTableList(GenTable genTable); + TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable, PageQuery pageQuery); /** * 鏌ヨ鎹簱鍒楄〃 @@ -34,7 +37,7 @@ * @param genTable 涓氬姟淇℃伅 * @return 鏁版嵁搴撹〃闆嗗悎 */ - List<GenTable> selectDbTableList(GenTable genTable); + TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable, PageQuery pageQuery); /** * 鏌ヨ鎹簱鍒楄〃 -- Gitblit v1.9.3