生成页面时不忽略remark属性

RuoYi

2020-08-26 a7d93d38ce810934f78129aa18eb88f0313128fb

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

@@ -1,6 +1,7 @@
package com.ruoyi.gen.service;



import java.io.ByteArrayOutputStream;

import java.io.File;

import java.io.IOException;

import java.io.StringWriter;

import java.util.LinkedHashMap;

@@ -22,7 +23,10 @@
import com.ruoyi.common.core.constant.Constants;

import com.ruoyi.common.core.constant.GenConstants;

import com.ruoyi.common.core.exception.CustomException;

import com.ruoyi.common.core.text.CharsetKit;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.core.utils.file.FileUtils;

import com.ruoyi.common.security.utils.SecurityUtils;

import com.ruoyi.gen.domain.GenTable;

import com.ruoyi.gen.domain.GenTableColumn;

import com.ruoyi.gen.mapper.GenTableColumnMapper;

@@ -142,10 +146,10 @@
    @Transactional

    public void importGenTable(List<GenTable> tableList)

    {

        String operName = "";

        for (GenTable table : tableList)

        String operName = SecurityUtils.getUsername();

        try

        {

            try

            for (GenTable table : tableList)

            {

                String tableName = table.getTableName();

                GenUtils.initTable(table, operName);

@@ -161,10 +165,10 @@
                    }

                }

            }

            catch (Exception e)

            {

                log.error("表名 " + table.getTableName() + " 导入失败：", e);

            }

        }

        catch (Exception e)

        {

            throw new CustomException("导入失败：" + e.getMessage());

        }

    }



@@ -200,13 +204,13 @@
    }



    /**

     * 生成代码

     * 生成代码（下载方式）

     * 

     * @param tableName 表名称

     * @return 数据

     */

    @Override

    public byte[] generatorCode(String tableName)

    public byte[] downloadCode(String tableName)

    {

        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

        ZipOutputStream zip = new ZipOutputStream(outputStream);

@@ -216,13 +220,55 @@
    }



    /**

     * 批量生成代码

     * 生成代码（自定义路径）

     * 
     * @param tableName 表名称

     * @return 数据

     */

    @Override

    public void generatorCode(String tableName)

    {

        // 查询表信息

        GenTable table = genTableMapper.selectGenTableByName(tableName);

        // 查询列信息

        List<GenTableColumn> columns = table.getColumns();

        setPkColumn(table, columns);



        VelocityInitializer.initVelocity();



        VelocityContext context = VelocityUtils.prepareContext(table);



        // 获取模板列表

        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());

        for (String template : templates)

        {

            if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm"))

            {

                // 渲染模板

                StringWriter sw = new StringWriter();

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

                tpl.merge(context, sw);

                try

                {

                    String path = getGenPath(table, template);

                    FileUtils.writeStringToFile(new File(path), sw.toString(), CharsetKit.UTF_8);

                }

                catch (IOException e)

                {

                    throw new CustomException("渲染模板失败，表名：" + table.getTableName());

                }

            }

        }

    }



    /**

     * 批量生成代码（下载方式）

     * 

     * @param tableNames 表数组

     * @return 数据

     */

    @Override

    public byte[] generatorCode(String[] tableNames)

    public byte[] downloadCode(String[] tableNames)

    {

        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

        ZipOutputStream zip = new ZipOutputStream(outputStream);

@@ -335,9 +381,31 @@
            String treeCode = paramsObj.getString(GenConstants.TREE_CODE);

            String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE);

            String treeName = paramsObj.getString(GenConstants.TREE_NAME);

            String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID);

            String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);

            
            genTable.setTreeCode(treeCode);

            genTable.setTreeParentCode(treeParentCode);

            genTable.setTreeName(treeName);

            genTable.setParentMenuId(parentMenuId);

            genTable.setParentMenuName(parentMenuName);

        }

    }

}


    /**

     * 获取代码生成地址

     * 
     * @param table 业务表信息

     * @param template 模板文件路径

     * @return 生成地址

     */

    public static String getGenPath(GenTable table, String template)

    {

        String genPath = table.getGenPath();

        if (StringUtils.equals(genPath, "/"))

        {

            return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table);

        }

        return genPath + File.separator + VelocityUtils.getFileName(template, table);

    }

}