抽取重复代码到一个方法并修改方法为private级别

ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenServiceImpl.java

@@ -60,12 +60,7 @@ public class GenServiceImpl implements IGenService
     {
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         ZipOutputStream zip = new ZipOutputStream(outputStream);
-        // 查询表信息
+        generatorCode(tableName, zip);
-        TableInfo table = genMapper.selectTableByName(tableName);
-        // 查询列信息
-        List<ColumnInfo> columns = genMapper.selectTableColumnsByName(tableName);
-        // 生成代码
-        generatorCode(table, columns, zip);
         IOUtils.closeQuietly(zip);
         return outputStream.toByteArray();
     }
@@ -83,22 +78,22 @@ public class GenServiceImpl implements IGenService
         ZipOutputStream zip = new ZipOutputStream(outputStream);
         for (String tableName : tableNames)
         {
-            // 查询表信息
+            generatorCode(tableName, zip);
-            TableInfo table = genMapper.selectTableByName(tableName);
-            // 查询列信息
-            List<ColumnInfo> columns = genMapper.selectTableColumnsByName(tableName);
-            // 生成代码
-            generatorCode(table, columns, zip);
         }
         IOUtils.closeQuietly(zip);
         return outputStream.toByteArray();
     }
 
     /**
-     * 生成代码
+     * 查询表信息并生成代码
      */
-    public void generatorCode(TableInfo table, List<ColumnInfo> columns, ZipOutputStream zip)
+    private void generatorCode(String tableName, ZipOutputStream zip)
     {
+        // 查询表信息
+        TableInfo table = genMapper.selectTableByName(tableName);
+        // 查询列信息
+        List<ColumnInfo> columns = genMapper.selectTableColumnsByName(tableName);
+
         // 表名转换成Java属性名
         String className = GenUtils.tableToJava(table.getTableName());
         table.setClassName(className);