From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

---
 ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java |   69 +++++++++++++++++++---------------
 1 files changed, 38 insertions(+), 31 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 f64b55a..1bf0c27 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,6 +1,7 @@
 package com.ruoyi.generator.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.generator.domain.GenTable;
 
 import java.util.List;
@@ -8,116 +9,122 @@
 
 /**
  * 涓氬姟 鏈嶅姟灞�
- * 
- * @author ruoyi
+ *
+ * @author Lion Li
  */
-public interface IGenTableService extends IService<GenTable>
-{
+public interface IGenTableService extends IService<GenTable> {
+
+
+    TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable);
+
+
+    TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable);
+
     /**
      * 鏌ヨ涓氬姟鍒楄〃
-     * 
+     *
      * @param genTable 涓氬姟淇℃伅
      * @return 涓氬姟闆嗗悎
      */
-    public List<GenTable> selectGenTableList(GenTable genTable);
+    List<GenTable> selectGenTableList(GenTable genTable);
 
     /**
      * 鏌ヨ鎹簱鍒楄〃
-     * 
+     *
      * @param genTable 涓氬姟淇℃伅
      * @return 鏁版嵁搴撹〃闆嗗悎
      */
-    public List<GenTable> selectDbTableList(GenTable genTable);
+    List<GenTable> selectDbTableList(GenTable genTable);
 
     /**
      * 鏌ヨ鎹簱鍒楄〃
-     * 
+     *
      * @param tableNames 琛ㄥ悕绉扮粍
      * @return 鏁版嵁搴撹〃闆嗗悎
      */
-    public List<GenTable> selectDbTableListByNames(String[] tableNames);
+    List<GenTable> selectDbTableListByNames(String[] tableNames);
 
     /**
      * 鏌ヨ鎵�鏈夎〃淇℃伅
      *
      * @return 琛ㄤ俊鎭泦鍚�
      */
-    public List<GenTable> selectGenTableAll();
+    List<GenTable> selectGenTableAll();
 
     /**
      * 鏌ヨ涓氬姟淇℃伅
-     * 
+     *
      * @param id 涓氬姟ID
      * @return 涓氬姟淇℃伅
      */
-    public GenTable selectGenTableById(Long id);
+    GenTable selectGenTableById(Long id);
 
     /**
      * 淇敼涓氬姟
-     * 
+     *
      * @param genTable 涓氬姟淇℃伅
      * @return 缁撴灉
      */
-    public void updateGenTable(GenTable genTable);
+    void updateGenTable(GenTable genTable);
 
     /**
      * 鍒犻櫎涓氬姟淇℃伅
-     * 
+     *
      * @param tableIds 闇�瑕佸垹闄ょ殑琛ㄦ暟鎹甀D
      * @return 缁撴灉
      */
-    public void deleteGenTableByIds(Long[] tableIds);
+    void deleteGenTableByIds(Long[] tableIds);
 
     /**
      * 瀵煎叆琛ㄧ粨鏋�
-     * 
+     *
      * @param tableList 瀵煎叆琛ㄥ垪琛�
      */
-    public void importGenTable(List<GenTable> tableList);
+    void importGenTable(List<GenTable> tableList);
 
     /**
      * 棰勮浠ｇ爜
-     * 
+     *
      * @param tableId 琛ㄧ紪鍙�
      * @return 棰勮鏁版嵁鍒楄〃
      */
-    public Map<String, String> previewCode(Long tableId);
+    Map<String, String> previewCode(Long tableId);
 
     /**
      * 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
-     * 
+     *
      * @param tableName 琛ㄥ悕绉�
      * @return 鏁版嵁
      */
-    public byte[] downloadCode(String tableName);
+    byte[] downloadCode(String tableName);
 
     /**
      * 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
-     * 
+     *
      * @param tableName 琛ㄥ悕绉�
      * @return 鏁版嵁
      */
-    public void generatorCode(String tableName);
+    void generatorCode(String tableName);
 
     /**
      * 鍚屾鏁版嵁搴�
-     * 
+     *
      * @param tableName 琛ㄥ悕绉�
      */
-    public void synchDb(String tableName);
+    void synchDb(String tableName);
 
     /**
      * 鎵归噺鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
-     * 
+     *
      * @param tableNames 琛ㄦ暟缁�
      * @return 鏁版嵁
      */
-    public byte[] downloadCode(String[] tableNames);
+    byte[] downloadCode(String[] tableNames);
 
     /**
      * 淇敼淇濆瓨鍙傛暟鏍￠獙
-     * 
+     *
      * @param genTable 涓氬姟淇℃伅
      */
-    public void validateEdit(GenTable genTable);
+    void validateEdit(GenTable genTable);
 }

--
Gitblit v1.9.3