RuoYi
2020-07-24 e818078392e2db431107af198b8a03ba23473e23
代码生成支持自定义路径
已修改6个文件
已重命名1个文件
152 ■■■■ 文件已修改
sql/ry_20200724.sql 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/common/utils/file/FileUtils.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tool/gen/service/IGenTableService.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mybatis/tool/GenTableMapper.xml 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sql/ry_20200724.sql
ÎļþÃû´Ó sql/ry_20200723.sql ÐÞ¸Ä
@@ -635,6 +635,8 @@
  business_name     varchar(30)                                comment '生成业务名',
  function_name     varchar(50)                                comment '生成功能名',
  function_author   varchar(50)                                comment '生成功能作者',
  gen_type          char(1)         default '0'                comment '生成代码方式(0zip压缩包 1自定义路径)',
  gen_path          varchar(200)    default '/'                comment '生成路径(不填默认项目路径)',
  options           varchar(1000)                              comment '其它生成选项',
  create_by         varchar(64)     default ''                 comment '创建者',
  create_time         datetime                                   comment '创建时间',
src/main/java/com/ruoyi/common/utils/file/FileUtils.java
@@ -14,7 +14,7 @@
 * 
 * @author ruoyi
 */
public class FileUtils
public class FileUtils extends org.apache.commons.io.FileUtils
{
    public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";
src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
@@ -148,15 +148,27 @@
    }
    /**
     * ç”Ÿæˆä»£ç 
     * ç”Ÿæˆä»£ç ï¼ˆä¸‹è½½æ–¹å¼ï¼‰
     */
    @PreAuthorize("@ss.hasPermi('tool:gen:code')")
    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
    @GetMapping("/download/{tableName}")
    public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
    {
        byte[] data = genTableService.downloadCode(tableName);
        genCode(response, data);
    }
    /**
     * ç”Ÿæˆä»£ç ï¼ˆè‡ªå®šä¹‰è·¯å¾„)
     */
    @PreAuthorize("@ss.hasPermi('tool:gen:code')")
    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
    @GetMapping("/genCode/{tableName}")
    public void genCode(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
    public AjaxResult genCode(HttpServletResponse response, @PathVariable("tableName") String tableName)
    {
        byte[] data = genTableService.generatorCode(tableName);
        genCode(response, data);
        genTableService.generatorCode(tableName);
        return AjaxResult.success();
    }
    /**
@@ -168,7 +180,7 @@
    public void batchGenCode(HttpServletResponse response, String tables) throws IOException
    {
        String[] tableNames = Convert.toStrArray(tables);
        byte[] data = genTableService.generatorCode(tableNames);
        byte[] data = genTableService.downloadCode(tableNames);
        genCode(response, data);
    }
src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
@@ -55,6 +55,12 @@
    @NotBlank(message = "作者不能为空")
    private String functionAuthor;
    /** ç”Ÿæˆä»£ç æ–¹å¼ï¼ˆ0zip压缩包 1自定义路径) */
    private String genType;
    /** ç”Ÿæˆè·¯å¾„(不填默认项目路径) */
    private String genPath;
    /** ä¸»é”®ä¿¡æ¯ */
    private GenTableColumn pkColumn;
@@ -180,6 +186,26 @@
        this.functionAuthor = functionAuthor;
    }
    public String getGenType()
    {
        return genType;
    }
    public void setGenType(String genType)
    {
        this.genType = genType;
    }
    public String getGenPath()
    {
        return genPath;
    }
    public void setGenPath(String genPath)
    {
        this.genPath = genPath;
    }
    public GenTableColumn getPkColumn()
    {
        return pkColumn;
src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.tool.gen.service;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.util.LinkedHashMap;
@@ -21,9 +22,11 @@
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.core.text.CharsetKit;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.project.tool.gen.domain.GenTable;
import com.ruoyi.project.tool.gen.domain.GenTableColumn;
import com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper;
@@ -202,13 +205,13 @@
    }
    /**
     * ç”Ÿæˆä»£ç 
     * ç”Ÿæˆä»£ç ï¼ˆä¸‹è½½æ–¹å¼ï¼‰
     * 
     * @param tableName è¡¨åç§°
     * @return æ•°æ®
     */
    @Override
    public byte[] generatorCode(String tableName)
    public byte[] downloadCode(String tableName)
    {
        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
        ZipOutputStream zip = new ZipOutputStream(outputStream);
@@ -218,13 +221,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);
@@ -347,4 +392,21 @@
            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);
    }
}
src/main/java/com/ruoyi/project/tool/gen/service/IGenTableService.java
@@ -75,20 +75,28 @@
    public Map<String, String> previewCode(Long tableId);
    /**
     * ç”Ÿæˆä»£ç 
     * ç”Ÿæˆä»£ç ï¼ˆä¸‹è½½æ–¹å¼ï¼‰
     * 
     * @param tableName è¡¨åç§°
     * @return æ•°æ®
     */
    public byte[] generatorCode(String tableName);
    public byte[] downloadCode(String tableName);
    /**
     * æ‰¹é‡ç”Ÿæˆä»£ç 
     * ç”Ÿæˆä»£ç ï¼ˆè‡ªå®šä¹‰è·¯å¾„)
     *
     * @param tableName è¡¨åç§°
     * @return æ•°æ®
     */
    public void generatorCode(String tableName);
    /**
     * æ‰¹é‡ç”Ÿæˆä»£ç ï¼ˆä¸‹è½½æ–¹å¼ï¼‰
     * 
     * @param tableNames è¡¨æ•°ç»„
     * @return æ•°æ®
     */
    public byte[] generatorCode(String[] tableNames);
    public byte[] downloadCode(String[] tableNames);
    /**
     * ä¿®æ”¹ä¿å­˜å‚数校验
src/main/resources/mybatis/tool/GenTableMapper.xml
@@ -15,6 +15,8 @@
        <result property="businessName"   column="business_name"   />
        <result property="functionName"   column="function_name"   />
        <result property="functionAuthor" column="function_author" />
        <result property="genType"        column="gen_type"        />
        <result property="genPath"        column="gen_path"        />
        <result property="options"        column="options"         />
        <result property="createBy"       column="create_by"       />
        <result property="createTime"     column="create_time"     />
@@ -50,7 +52,7 @@
    </resultMap>
    
    <sql id="selectGenTableVo">
        select table_id, table_name, table_comment, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, options, create_by, create_time, update_by, update_time, remark from gen_table
        select table_id, table_name, table_comment, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
    </sql>
    
    <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
@@ -106,7 +108,7 @@
    </select>
    
    <select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
        SELECT t.table_id, t.table_name, t.table_comment, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
        SELECT t.table_id, t.table_name, t.table_comment, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
               c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
        FROM gen_table t
             LEFT JOIN gen_table_column c ON t.table_id = c.table_id
@@ -114,7 +116,7 @@
    </select>
    
    <select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
        SELECT t.table_id, t.table_name, t.table_comment, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
        SELECT t.table_id, t.table_name, t.table_comment, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
               c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
        FROM gen_table t
             LEFT JOIN gen_table_column c ON t.table_id = c.table_id
@@ -132,6 +134,8 @@
            <if test="businessName != null and businessName != ''">business_name,</if>
            <if test="functionName != null and functionName != ''">function_name,</if>
            <if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
            <if test="genType != null and genType != ''">gen_type,</if>
            <if test="genPath != null and genPath != ''">gen_path,</if>
            <if test="remark != null and remark != ''">remark,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
            create_time
@@ -145,6 +149,8 @@
            <if test="businessName != null and businessName != ''">#{businessName},</if>
            <if test="functionName != null and functionName != ''">#{functionName},</if>
            <if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
            <if test="genType != null and genType != ''">#{genType},</if>
            <if test="genPath != null and genPath != ''">#{genPath},</if>
            <if test="remark != null and remark != ''">#{remark},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
            sysdate()
@@ -158,6 +164,8 @@
            <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
            <if test="className != null and className != ''">class_name = #{className},</if>
            <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
            <if test="genType != null and genType != ''">gen_type = #{genType},</if>
            <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
            <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>
            <if test="packageName != null and packageName != ''">package_name = #{packageName},</if>
            <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>