修复typescript版多表代码生成报错问题

RuoYi

2026-03-25 50fc2989eeda1e5bbdf0a67dd15fa545db2370ed

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java

@@ -4,6 +4,8 @@
import java.io.File;

import java.io.IOException;

import java.io.StringWriter;

import java.util.Arrays;

import java.util.HashMap;

import java.util.LinkedHashMap;

import java.util.List;

import java.util.Map;

@@ -228,11 +230,7 @@
    @Override

    public byte[] downloadCode(String tableName)

    {

        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

        ZipOutputStream zip = new ZipOutputStream(outputStream);

        generatorCode(tableName, zip);

        IOUtils.closeQuietly(zip);

        return outputStream.toByteArray();

        return downloadCode(new String[] { tableName });

    }



    /**

@@ -343,9 +341,14 @@
    {

        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

        ZipOutputStream zip = new ZipOutputStream(outputStream);

        Map<String, StringBuffer> typeFiles = new HashMap<>();

        for (String tableName : tableNames)

        {

            generatorCode(tableName, zip);

            generatorCode(tableName, zip, typeFiles);

        }

        for (Map.Entry<String, StringBuffer> entry : typeFiles.entrySet())

        {

            writeToZip(zip, entry.getKey(), entry.getValue().toString());

        }

        IOUtils.closeQuietly(zip);

        return outputStream.toByteArray();

@@ -354,7 +357,7 @@
    /**

     * 查询表信息并生成代码

     */

    private void generatorCode(String tableName, ZipOutputStream zip)

    private void generatorCode(String tableName, ZipOutputStream zip, Map<String, StringBuffer> typeFiles)

    {

        // 查询表信息

        GenTable table = genTableMapper.selectGenTableByName(tableName);

@@ -375,19 +378,46 @@
            StringWriter sw = new StringWriter();

            Template tpl = Velocity.getTemplate(template, Constants.UTF8);

            tpl.merge(context, sw);

            String fileName = VelocityUtils.getFileName(template, table);

            // index-bak.ts 模版，追加内容

            if (fileName.contains("index-bak.ts"))

            {

                if (!typeFiles.containsKey(fileName))

                {

                    typeFiles.put(fileName, new StringBuffer(sw.toString()));

                }

                else

                {

                    Arrays.stream(sw.toString().split("\n")).filter(line -> line.startsWith("export * from")).forEach(line -> typeFiles.get(fileName).append("\n").append(line));

                }

            }

            else

            {

                // 其他文件正常添加

                writeToZip(zip, fileName, sw.toString());

            }

        }

    }



    /**

     * 将字符串内容写入ZIP输出流

     * 
     * @param zip ZIP输出流

     * @param fileName ZIP条目名称（即文件名）

     * @param content 要写入的内容

     */

    private void writeToZip(ZipOutputStream zip, String fileName, String content)

    {

            try

            {

                // 添加到zip

                zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));

                IOUtils.write(sw.toString(), zip, Constants.UTF8);

                IOUtils.closeQuietly(sw);

            zip.putNextEntry(new ZipEntry(fileName));

            IOUtils.write(content, zip, Constants.UTF8);

                zip.flush();

                zip.closeEntry();

            }

            catch (IOException e)

            {

                log.error("渲染模板失败，表名：" + table.getTableName(), e);

            }

            log.error("写入ZIP文件失败，文件名: " + fileName, e);

        }

    }