Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2021-01-11 684eadbcc63b369c9ae2e494fb5890fc62245e82

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue


 Conflicts:

	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml

	ruoyi-generator/src/main/resources/vm/java/controller.java.vm

	ruoyi-generator/src/main/resources/vm/java/domain.java.vm

	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm

	ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm

	ruoyi-ui/src/views/system/user/index.vue

	ruoyi-ui/src/views/tool/gen/editTable.vue

	ruoyi-ui/src/views/tool/gen/genInfoForm.vue

	ruoyi-ui/src/views/tool/gen/index.vue

	sql/ry_20210108.sql

 pom.xml

@@ -18,7 +18,7 @@
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

        <java.version>1.8</java.version>

        <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>

        <druid.version>1.2.2</druid.version>

        <druid.version>1.2.4</druid.version>

        <bitwalker.version>1.21</bitwalker.version>

        <swagger.version>2.9.2</swagger.version>

        <kaptcha.version>2.3.2</kaptcha.version>


 ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java

@@ -13,6 +13,9 @@
    /** æ ‘表（增删改查） */
    public static final String TPL_TREE = "tree";

    /** ä¸»å­è¡¨ï¼ˆå¢žåˆ æ”¹æŸ¥ï¼‰ */
    public static final String TPL_SUB = "sub";

    /** æ ‘编码字段 */
    public static final String TREE_CODE = "treeCode";


 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -1059,7 +1059,7 @@
                    }

                    else

                    {

                        if ((Double) val % 1 > 0)

                        if ((Double) val % 1 != 0)

                        {

                            val = new BigDecimal(val.toString());

                        }


 ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

@@ -63,10 +63,12 @@
    public AjaxResult getInfo(@PathVariable Long talbleId)
    {
        GenTable table = genTableService.selectGenTableById(talbleId);
        List<GenTable> tables = genTableService.selectGenTableAll();
        List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId);
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("info", table);
        map.put("rows", list);
        map.put("tables", tables);
        return AjaxResult.success(map);
    }


 ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

@@ -28,11 +28,17 @@
    @NotBlank(message = "表描述不能为空")
    private String tableComment;

    /** å…³è”父表的表名 */
    private String subTableName;

    /** æœ¬è¡¨å…³è”父表的外键名 */
    private String subTableFkName;

    /** å®žä½“类名称(首字母大写) */
    @NotBlank(message = "实体类名称不能为空")
    private String className;

    /** ä½¿ç”¨çš„模板（crud单表操作 tree树表操作） */
    /** ä½¿ç”¨çš„模板（crud单表操作 tree树表操作 sub主子表操作） */
    private String tplCategory;

    /** ç”ŸæˆåŒ…路径 */
@@ -63,6 +69,9 @@

    /** ä¸»é”®ä¿¡æ¯ */
    private GenTableColumn pkColumn;

    /** å­è¡¨ä¿¡æ¯ */
    private GenTable subTable;

    /** è¡¨åˆ—信息 */
    @Valid
@@ -114,6 +123,26 @@
    public void setTableComment(String tableComment)
    {
        this.tableComment = tableComment;
    }

    public String getSubTableName()
    {
        return subTableName;
    }

    public void setSubTableName(String subTableName)
    {
        this.subTableName = subTableName;
    }

    public String getSubTableFkName()
    {
        return subTableFkName;
    }

    public void setSubTableFkName(String subTableFkName)
    {
        this.subTableFkName = subTableFkName;
    }

    public String getClassName()
@@ -216,6 +245,16 @@
        this.pkColumn = pkColumn;
    }

    public GenTable getSubTable()
    {
        return subTable;
    }

    public void setSubTable(GenTable subTable)
    {
        this.subTable = subTable;
    }

    public List<GenTableColumn> getColumns()
    {
        return columns;
@@ -286,6 +325,16 @@
        this.parentMenuName = parentMenuName;
    }

    public boolean isSub()
    {
        return isSub(this.tplCategory);
    }

    public static boolean isSub(String tplCategory)
    {
        return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
    }

    public boolean isTree()
    {
        return isTree(this.tplCategory);

 ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java

@@ -59,7 +59,7 @@
    /** æŸ¥è¯¢æ–¹å¼ï¼ˆEQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围） */
    private String queryType;

    /** æ˜¾ç¤ºç±»åž‹ï¼ˆinput文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、upload上传控件、editor富文本控件） */
    /** æ˜¾ç¤ºç±»åž‹ï¼ˆinput文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件） */
    private String htmlType;

    /** å­—典类型 */
@@ -138,6 +138,11 @@
        return javaField;
    }

    public String getCapJavaField()
    {
        return StringUtils.capitalize(javaField);
    }

    public void setIsPk(String isPk)
    {
        this.isPk = isPk;

 ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java

@@ -35,6 +35,13 @@
    public List<GenTable> selectDbTableListByNames(String[] tableNames);

    /**
     * æŸ¥è¯¢æ‰€æœ‰è¡¨ä¿¡æ¯
     *
     * @return è¡¨ä¿¡æ¯é›†åˆ
     */
    public List<GenTable> selectGenTableAll();

    /**
     * æŸ¥è¯¢è¡¨ID业务信息
     * 
     * @param id ä¸šåŠ¡ID

 ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

@@ -103,6 +103,17 @@
    }

    /**
     * æŸ¥è¯¢æ‰€æœ‰è¡¨ä¿¡æ¯
     *
     * @return è¡¨ä¿¡æ¯é›†åˆ
     */
    @Override
    public List<GenTable> selectGenTableAll()
    {
        return genTableMapper.selectGenTableAll();
    }

    /**
     * ä¿®æ”¹ä¸šåŠ¡
     * 
     * @param genTable ä¸šåŠ¡ä¿¡æ¯
@@ -185,9 +196,10 @@
        Map<String, String> dataMap = new LinkedHashMap<>();
        // æŸ¥è¯¢è¡¨ä¿¡æ¯
        GenTable table = genTableMapper.selectGenTableById(tableId);
        // æŸ¥è¯¢åˆ—信息
        List<GenTableColumn> columns = table.getColumns();
        setPkColumn(table, columns);
        // è®¾ç½®ä¸»å­è¡¨ä¿¡æ¯
        setSubTable(table);
        // è®¾ç½®ä¸»é”®åˆ—信息
        setPkColumn(table);
        VelocityInitializer.initVelocity();

        VelocityContext context = VelocityUtils.prepareContext(table);
@@ -231,9 +243,10 @@
    {
        // æŸ¥è¯¢è¡¨ä¿¡æ¯
        GenTable table = genTableMapper.selectGenTableByName(tableName);
        // æŸ¥è¯¢åˆ—信息
        List<GenTableColumn> columns = table.getColumns();
        setPkColumn(table, columns);
        // è®¾ç½®ä¸»å­è¡¨ä¿¡æ¯
        setSubTable(table);
        // è®¾ç½®ä¸»é”®åˆ—信息
        setPkColumn(table);

        VelocityInitializer.initVelocity();

@@ -276,6 +289,10 @@
        List<String> tableColumnNames = tableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());

        List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
        if (StringUtils.isEmpty(dbTableColumns))
        {
            throw new CustomException("同步数据失败，原表结构不存在");
        }
        List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());

        dbTableColumns.forEach(column -> {
@@ -319,9 +336,10 @@
    {
        // æŸ¥è¯¢è¡¨ä¿¡æ¯
        GenTable table = genTableMapper.selectGenTableByName(tableName);
        // æŸ¥è¯¢åˆ—信息
        List<GenTableColumn> columns = table.getColumns();
        setPkColumn(table, columns);
        // è®¾ç½®ä¸»å­è¡¨ä¿¡æ¯
        setSubTable(table);
        // è®¾ç½®ä¸»é”®åˆ—信息
        setPkColumn(table);

        VelocityInitializer.initVelocity();

@@ -375,6 +393,17 @@
            {
                throw new CustomException("树名称字段不能为空");
            }
            else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory()))
            {
                if (StringUtils.isEmpty(genTable.getSubTableName()))
                {
                    throw new CustomException("关联子表的表名不能为空");
                }
                else if (StringUtils.isEmpty(genTable.getSubTableFkName()))
                {
                    throw new CustomException("子表关联的外键名不能为空");
                }
            }
        }
    }

@@ -382,11 +411,10 @@
     * è®¾ç½®ä¸»é”®åˆ—信息
     * 
     * @param table ä¸šåŠ¡è¡¨ä¿¡æ¯
     * @param columns ä¸šåŠ¡å­—段列表
     */
    public void setPkColumn(GenTable table, List<GenTableColumn> columns)
    public void setPkColumn(GenTable table)
    {
        for (GenTableColumn column : columns)
        for (GenTableColumn column : table.getColumns())
        {
            if (column.isPk())
            {
@@ -396,7 +424,36 @@
        }
        if (StringUtils.isNull(table.getPkColumn()))
        {
            table.setPkColumn(columns.get(0));
            table.setPkColumn(table.getColumns().get(0));
        }
        if (GenConstants.TPL_SUB.equals(table.getTplCategory()))
        {
            for (GenTableColumn column : table.getSubTable().getColumns())
            {
                if (column.isPk())
                {
                    table.getSubTable().setPkColumn(column);
                    break;
                }
            }
            if (StringUtils.isNull(table.getSubTable().getPkColumn()))
            {
                table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));
            }
        }
    }

    /**
     * è®¾ç½®ä¸»å­è¡¨ä¿¡æ¯
     *
     * @param table ä¸šåŠ¡è¡¨ä¿¡æ¯
     */
    public void setSubTable(GenTable table)
    {
        String subTableName = table.getSubTableName();
        if (StringUtils.isNotEmpty(subTableName))
        {
            table.setSubTable(genTableMapper.selectGenTableByName(subTableName));
        }
    }


 ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java

@@ -36,6 +36,13 @@
    public List<GenTable> selectDbTableListByNames(String[] tableNames);

    /**
     * æŸ¥è¯¢æ‰€æœ‰è¡¨ä¿¡æ¯
     *
     * @return è¡¨ä¿¡æ¯é›†åˆ
     */
    public List<GenTable> selectGenTableAll();

    /**
     * æŸ¥è¯¢ä¸šåŠ¡ä¿¡æ¯
     * 
     * @param id ä¸šåŠ¡ID

 ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java

@@ -7,7 +7,7 @@
/**
 * VelocityEngine工厂
 * 
 * @author RuoYi
 * @author ruoyi
 */
public class VelocityInitializer
{

 ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

@@ -54,7 +54,7 @@
        velocityContext.put("author", genTable.getFunctionAuthor());
        velocityContext.put("datetime", DateUtils.getDate());
        velocityContext.put("pkColumn", genTable.getPkColumn());
        velocityContext.put("importList", getImportList(genTable.getColumns()));
        velocityContext.put("importList", getImportList(genTable));
        velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
        velocityContext.put("columns", genTable.getColumns());
        velocityContext.put("table", genTable);
@@ -62,6 +62,10 @@
        if (GenConstants.TPL_TREE.equals(tplCategory))
        {
            setTreeVelocityContext(velocityContext, genTable);
        }
        if (GenConstants.TPL_SUB.equals(tplCategory))
        {
            setSubVelocityContext(velocityContext, genTable);
        }
        return velocityContext;
    }
@@ -96,6 +100,24 @@
        }
    }

    public static void setSubVelocityContext(VelocityContext context, GenTable genTable)
    {
        GenTable subTable = genTable.getSubTable();
        String subTableName = genTable.getSubTableName();
        String subTableFkName = genTable.getSubTableFkName();
        String subClassName = genTable.getSubTable().getClassName();
        String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName);

        context.put("subTable", subTable);
        context.put("subTableName", subTableName);
        context.put("subTableFkName", subTableFkName);
        context.put("subTableFkClassName", subTableFkClassName);
        context.put("subTableFkclassName", StringUtils.uncapitalize(subTableFkClassName));
        context.put("subClassName", subClassName);
        context.put("subclassName", StringUtils.uncapitalize(subClassName));
        context.put("subImportList", getImportList(genTable.getSubTable()));
    }

    /**
     * èŽ·å–模板信息
     *
@@ -119,6 +141,11 @@
        else if (GenConstants.TPL_TREE.equals(tplCategory))
        {
            templates.add("vm/vue/index-tree.vue.vm");
        }
        else if (GenConstants.TPL_SUB.equals(tplCategory))
        {
            templates.add("vm/vue/index.vue.vm");
            templates.add("vm/java/sub-domain.java.vm");
        }
        return templates;
    }
@@ -146,6 +173,10 @@
        if (template.contains("domain.java.vm"))
        {
            fileName = StringUtils.format("{}/domain/{}.java", javaPath, className);
        }
        if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory()))
        {
            fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
        }
        else if (template.contains("mapper.java.vm"))
        {
@@ -202,12 +233,18 @@
    /**
     * æ ¹æ®åˆ—类型获取导入包
     *
     * @param columns åˆ—集合
     * @param genTable ä¸šåŠ¡è¡¨å¯¹è±¡
     * @return è¿”回需要导入的包列表
     */
    public static HashSet<String> getImportList(List<GenTableColumn> columns)
    public static HashSet<String> getImportList(GenTable genTable)
    {
        List<GenTableColumn> columns = genTable.getColumns();
        GenTable subGenTable = genTable.getSubTable();
        HashSet<String> importList = new HashSet<String>();
        if (StringUtils.isNotNull(subGenTable))
        {
            importList.add("java.util.List");
        }
        for (GenTableColumn column : columns)
        {
            if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType()))

 ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -5,24 +5,26 @@
<mapper namespace="com.ruoyi.generator.mapper.GenTableMapper">

    <resultMap type="GenTable" id="GenTableResult">
        <id     property="tableId"        column="table_id"        />
        <result property="tableName"      column="table_name"      />
        <result property="tableComment"   column="table_comment"   />
        <result property="className"      column="class_name"      />
        <result property="tplCategory"    column="tpl_category"    />
        <result property="packageName"    column="package_name"    />
        <result property="moduleName"     column="module_name"     />
        <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"     />
        <result property="updateBy"       column="update_by"       />
        <result property="updateTime"     column="update_time"     />
        <result property="remark"         column="remark"          />
        <id     property="tableId"        column="table_id"          />
        <result property="tableName"      column="table_name"        />
        <result property="tableComment"   column="table_comment"     />
        <result property="subTableName"   column="sub_table_name"    />
        <result property="subTableFkName" column="sub_table_fk_name" />
        <result property="className"      column="class_name"        />
        <result property="tplCategory"    column="tpl_category"      />
        <result property="packageName"    column="package_name"      />
        <result property="moduleName"     column="module_name"       />
        <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"       />
        <result property="updateBy"       column="update_by"         />
        <result property="updateTime"     column="update_time"       />
        <result property="remark"         column="remark"            />
        <collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
    </resultMap>
    
@@ -52,7 +54,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, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, 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">
@@ -108,7 +110,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.gen_type, t.gen_path, t.options, t.remark,
        SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, 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
@@ -116,13 +118,21 @@
    </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.gen_type, t.gen_path, t.options, t.remark,
        SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, 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
        where t.table_name = #{tableName} order by c.sort
    </select>
	

    <select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
        SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, 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,
               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
        order by c.sort
    </select>

    <insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
        insert into gen_table (
            <if test="tableName != null">table_name,</if>
@@ -162,6 +172,8 @@
        <set>
            <if test="tableName != null">table_name = #{tableName},</if>
            <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
            <if test="subTableName != null">sub_table_name = #{subTableName},</if>
            <if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</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>

 ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -21,7 +21,7 @@
import ${packageName}.domain.${ClassName};
import ${packageName}.service.I${ClassName}Service;
import com.ruoyi.common.utils.poi.ExcelUtil;
#if($table.crud)
#if($table.crud || $table.sub)
import com.ruoyi.common.core.page.TableDataInfo;
#elseif($table.tree)
#end
@@ -44,7 +44,7 @@
     */
    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
    @GetMapping("/list")
#if($table.crud)
#if($table.crud || $table.sub)
    public TableDataInfo list(${ClassName} ${className}) {
        startPage();
        List<${ClassName}> list = i${ClassName}Service.queryList(${className});

 ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -32,51 +32,51 @@
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
#if($column.query)
#if($column.queryType == "EQ")
#if($javaType == 'String') 
#if($javaType == 'String')
        if (StringUtils.isNotBlank(${className}.get$AttrName())){
            lqw.eq(${ClassName}::get$AttrName ,${className}.get$AttrName());
        }
#else 
#else
        if (${className}.get$AttrName() != null){
            lqw.eq(${ClassName}::get$AttrName ,${className}.get$AttrName());
        }
#end
#elseif($queryType == "NE")
#if($javaType == 'String') 
#if($javaType == 'String')
        if (StringUtils.isNotBlank(${className}.get$AttrName())){
            lqw.ne(${ClassName}::get$AttrName ,${className}.get$AttrName());
        }
#else 
#else
        if (${className}.get$AttrName() != null){
            lqw.ne(${ClassName}::get$AttrName ,${className}.get$AttrName());
        }
#end 
#end
#elseif($queryType == "GT")
#if($javaType == 'String') 
#if($javaType == 'String')
        if (StringUtils.isNotBlank(${className}.get$AttrName())){
            lqw.gt(${ClassName}::get$AttrName ,${className}.get$AttrName());
        }
#else 
#else
        if (${className}.get$AttrName() != null){
            lqw.gt(${ClassName}::get$AttrName ,${className}.get$AttrName());
        }
#end
#elseif($queryType == "GTE")
#if($javaType == 'String') 
#if($javaType == 'String')
        if (StringUtils.isNotBlank(${className}.get$AttrName())){
            lqw.ge(${ClassName}::get$AttrName ,${className}.get$AttrName());
        }
#else 
#else
        if (${className}.get$AttrName() != null){
            lqw.ge(${ClassName}::get$AttrName ,${className}.get$AttrName());
        }
#end
#elseif($queryType == "LT")
#if($javaType == 'String') 
#if($javaType == 'String')
        if (StringUtils.isNotBlank(${className}.get$AttrName())){
            lqw.lt(${ClassName}::get$AttrName ,${className}.get$AttrName());
        }
#else 
#else
        if (${className}.get$AttrName() != null){
            lqw.lt(${ClassName}::get$AttrName ,${className}.get$AttrName());
        }

 ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,76 @@
package ${packageName}.domain;



#foreach ($import in $subImportList)

import ${import};

#end

import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;

import com.ruoyi.common.annotation.Excel;

import com.ruoyi.common.core.domain.BaseEntity;



/**

 * ${subTable.functionName}对象 ${subTableName}

 * 
 * @author ${author}

 * @date ${datetime}

 */

public class ${subClassName} extends BaseEntity

{

    private static final long serialVersionUID = 1L;



#foreach ($column in $subTable.columns)

#if(!$table.isSuperColumn($column.javaField))

    /** $column.columnComment */

#if($column.list)

#set($parentheseIndex=$column.columnComment.indexOf("（"))

#if($parentheseIndex != -1)

#set($comment=$column.columnComment.substring(0, $parentheseIndex))

#else

#set($comment=$column.columnComment)

#end

#if($parentheseIndex != -1)

    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")

#elseif($column.javaType == 'Date')

    @JsonFormat(pattern = "yyyy-MM-dd")

    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")

#else

    @Excel(name = "${comment}")

#end

#end

    private $column.javaType $column.javaField;



#end

#end

#foreach ($column in $subTable.columns)

#if(!$table.isSuperColumn($column.javaField))

#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))

#set($AttrName=$column.javaField)

#else

#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})

#end

    public void set${AttrName}($column.javaType $column.javaField) 
    {

        this.$column.javaField = $column.javaField;

    }



    public $column.javaType get${AttrName}() 
    {

        return $column.javaField;

    }

#end

#end



    @Override

    public String toString() {

        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

#foreach ($column in $subTable.columns)

#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))

#set($AttrName=$column.javaField)

#else

#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})

#end

            .append("${column.javaField}", get${AttrName}())

#end

            .toString();

    }

}


 ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm

@@ -73,7 +73,7 @@
      <el-col :span="1.5">

        <el-button

          type="primary"

          plain

          plain

          icon="el-icon-plus"

          size="mini"

          @click="handleAdd"

@@ -159,7 +159,7 @@
        </el-form-item>

#elseif($column.htmlType == "fileUpload")

        <el-form-item label="${comment}">

          <imageUpload v-model="form.${field}"/>

          <fileUpload v-model="form.${field}"/>

        </el-form-item>

#elseif($column.htmlType == "editor")

        <el-form-item label="${comment}">


 ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -73,7 +73,7 @@
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
@@ -83,7 +83,7 @@
      <el-col :span="1.5">
        <el-button
          type="success"
          plain
          plain
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
@@ -94,7 +94,7 @@
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          plain
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
@@ -105,7 +105,7 @@
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
@@ -266,6 +266,38 @@
#end
#end
#end
#if($table.sub)
        <el-divider content-position="center">${subTable.functionName}信息</el-divider>
        <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}">添加</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete${subClassName}">删除</el-button>
          </el-col>
        </el-row>
        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
          <el-table-column type="selection" width="50" align="center" />
          <el-table-column label="序号" align="center" prop="index" width="50"/>
#foreach($column in $subTable.columns)
#set($javaField=$column.javaField)
#set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex))
#else
#set($comment=$column.columnComment)
#end
#if($column.pk || $javaField == ${subTableFkclassName})
#elseif($column.list && "" != $javaField)
          <el-table-column label="$comment" prop="${javaField}">
            <template slot-scope="scope">
              <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />
            </template>
          </el-table-column>
#end
#end
        </el-table>
#end
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">ç¡® å®š</el-button>
@@ -324,6 +356,10 @@
      loading: true,
      // é€‰ä¸­æ•°ç»„
      ids: [],
#if($table.sub)
      // å­è¡¨é€‰ä¸­æ•°æ®
      checked${subClassName}: [],
#end
      // éžå•ä¸ªç¦ç”¨
      single: true,
      // éžå¤šä¸ªç¦ç”¨
@@ -334,6 +370,10 @@
      total: 0,
      // ${functionName}表格数据
      ${businessName}List: [],
#if($table.sub)
      // ${subTable.functionName}表格数据
      ${subclassName}List: [],
#end
      // å¼¹å‡ºå±‚标题
      title: "",
      // æ˜¯å¦æ˜¾ç¤ºå¼¹å‡ºå±‚
@@ -456,6 +496,9 @@
#end
#end
      };
#if($table.sub)
      this.${subclassName}List = [];
#end
      this.resetForm("form");
    },
    /** æœç´¢æŒ‰é’®æ“ä½œ */
@@ -497,6 +540,9 @@
        this.form.$column.javaField = this.form.${column.javaField}.split(",");
#end
#end
#if($table.sub)
        this.${subclassName}List = response.data.${subclassName}List;
#end
        this.open = true;
        this.title = "修改${functionName}";
      });
@@ -509,6 +555,9 @@
#if($column.htmlType == "checkbox")
          this.form.$column.javaField = this.form.${column.javaField}.join(",");
#end
#end
#if($table.sub)
          this.form.${subclassName}List = this.${subclassName}List;
#end
          if (this.form.${pkColumn.javaField} != null) {
            update${BusinessName}(this.form).then(response => {
@@ -540,6 +589,40 @@
          this.msgSuccess("删除成功");
        })
    },
#if($table.sub)
    /** ${subTable.functionName}序号 */
    row${subClassName}Index({ row, rowIndex }) {
      row.index = rowIndex + 1;
    },
    /** ${subTable.functionName}添加按钮操作 */
    handleAdd${subClassName}() {
      let obj = {};
#foreach($column in $subTable.columns)
#if($column.pk || $column.javaField == ${subTableFkclassName})
#elseif($column.list && "" != $javaField)
      obj.$column.javaField = "";
#end
#end
      this.${subclassName}List.push(obj);
    },
    /** ${subTable.functionName}删除按钮操作 */
    handleDelete${subClassName}() {
      if (this.checked${subClassName}.length == 0) {
        this.$alert("请先选择要删除的${subTable.functionName}数据", "提示", { confirmButtonText: "确定", });
      } else {
        this.${subclassName}List.splice(this.checked${subClassName}[0].index - 1, 1);
      }
    },
    /** å•é€‰æ¡†é€‰ä¸­æ•°æ® */
    handle${subClassName}SelectionChange(selection) {
      if (selection.length > 1) {
        this.$refs.${subclassName}.clearSelection();
        this.$refs.${subclassName}.toggleRowSelection(selection.pop());
      } else {
        this.checked${subClassName} = selection;
      }
    },
#end
    /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
    handleExport() {
      const queryParams = this.queryParams;

 ruoyi-ui/src/components/FileUpload/index.vue

@@ -90,6 +90,7 @@
          return item;

        });

      } else {

        this.fileList = [];

        return [];

      }

    },


 ruoyi-ui/src/components/RightToolbar/index.vue

@@ -1,4 +1,3 @@
<!-- @author Shiyn/   huangmx 20200807优化-->

<template>

  <div class="top-right-btn">

    <el-row>

@@ -8,31 +7,74 @@
      <el-tooltip class="item" effect="dark" content="刷新" placement="top">

        <el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />

      </el-tooltip>

      <el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="columns">

        <el-button size="mini" circle icon="el-icon-menu" @click="showColumn()" />

      </el-tooltip>

    </el-row>

    <el-dialog :title="title" :visible.sync="open" append-to-body>

      <el-transfer

        :titles="['显示', '隐藏']"

        v-model="value"

        :data="columns"

        @change="dataChange"

      ></el-transfer>

    </el-dialog>

  </div>

</template>

<script>

export default {

  name: "RightToolbar",

  data() {

    return {};

    return {

      // æ˜¾éšæ•°æ®

      value: [],

      // å¼¹å‡ºå±‚标题

      title: "显示/隐藏",

      // æ˜¯å¦æ˜¾ç¤ºå¼¹å‡ºå±‚

      open: false,

    };

  },

  props: {

    showSearch: {

      type: Boolean,

      default: true,

    },

    columns: {

      type: Array,

    },

  },



  methods: {

    //搜索

    // æœç´¢

    toggleSearch() {

      this.$emit("update:showSearch", !this.showSearch);

    },

    //刷新

    // åˆ·æ–°

    refresh() {

      this.$emit("queryTable");

    },

    // å³ä¾§åˆ—表元素变化

    dataChange(data) {

      for (var item in this.columns) {

        const key = this.columns[item].key;

        this.columns[item].visible = !data.includes(key);

      }

    },

    // æ‰“开显隐列dialog

    showColumn() {

      this.open = true;

    },

  },

};

</script>

<style lang="scss" scoped>

::v-deep .el-transfer__button {

  border-radius: 50%;

  padding: 12px;

  display: block;

  margin-left: 0px;

}

::v-deep .el-transfer__button:first-child {

  margin-bottom: 10px;

}

</style>


 ruoyi-ui/src/layout/components/global.js

ÎļþÒÑɾ³ý

 ruoyi-ui/src/views/system/user/index.vue

@@ -135,17 +135,17 @@
              v-hasPermi="['system:user:export']"
            >导出</el-button>
          </el-col>
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
        </el-row>

        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="50" align="center" />
          <el-table-column label="用户编号" align="center" prop="userId" />
          <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" />
          <el-table-column label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />
          <el-table-column label="部门" align="center" prop="dept.deptName" :show-overflow-tooltip="true" />
          <el-table-column label="手机号码" align="center" prop="phonenumber" width="120" />
          <el-table-column label="状态" align="center">
          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
            <template slot-scope="scope">
              <el-switch
                v-model="scope.row.status"
@@ -155,7 +155,7 @@
              ></el-switch>
            </template>
          </el-table-column>
          <el-table-column label="创建时间" align="center" prop="createTime" width="160">
          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.createTime) }}</span>
            </template>
@@ -418,6 +418,16 @@
        status: undefined,
        deptId: undefined
      },
      // åˆ—信息
      columns: [
        { key: 0, label: `用户编号`, visible: true },
        { key: 1, label: `用户名称`, visible: true },
        { key: 2, label: `用户昵称`, visible: true },
        { key: 3, label: `部门`, visible: true },
        { key: 4, label: `手机号码`, visible: true },
        { key: 5, label: `状态`, visible: true },
        { key: 6, label: `创建时间`, visible: true }
      ],
      // è¡¨å•æ ¡éªŒ
      rules: {
        userName: [
@@ -662,4 +672,4 @@
    }
  }
};
</script>
</script>

 ruoyi-ui/src/views/tool/gen/editTable.vue

@@ -113,7 +113,7 @@
        </el-table>
      </el-tab-pane>
      <el-tab-pane label="生成信息" name="genInfo">
        <gen-info-form ref="genInfo" :info="info" :menus="menus"/>
        <gen-info-form ref="genInfo" :info="info" :tables="tables" :menus="menus"/>
      </el-tab-pane>
    </el-tabs>
    <el-form label-width="100px">
@@ -144,6 +144,8 @@
      activeName: "cloum",
      // è¡¨æ ¼çš„高度
      tableHeight: document.documentElement.scrollHeight - 245 + "px",
      // è¡¨ä¿¡æ¯
      tables: [],
      // è¡¨åˆ—信息
      cloumns: [],
      // å­—典信息
@@ -161,6 +163,7 @@
      getGenTable(tableId).then(res => {
        this.cloumns = res.data.rows;
        this.info = res.data.info;
        this.tables = res.data.tables;
      });
      /** æŸ¥è¯¢å­—典下拉列表 */
      getDictOptionselect().then(response => {

 ruoyi-ui/src/views/tool/gen/genInfoForm.vue

@@ -4,9 +4,10 @@
      <el-col :span="12">
        <el-form-item prop="tplCategory">
          <span slot="label">生成模板</span>
          <el-select v-model="info.tplCategory">
          <el-select v-model="info.tplCategory" @change="tplSelectChange">
            <el-option label="单表（增删改查）" value="crud" />
            <el-option label="树表（增删改查）" value="tree" />
            <el-option label="主子表（增删改查）" value="sub" />
          </el-select>
        </el-form-item>
      </el-col>
@@ -126,8 +127,8 @@
          </span>
          <el-select v-model="info.treeCode" placeholder="请选择">
            <el-option
              v-for="column in info.columns"
              :key="column.columnName"
              v-for="(column, index) in info.columns"
              :key="index"
              :label="column.columnName + '：' + column.columnComment"
              :value="column.columnName"
            ></el-option>
@@ -144,8 +145,8 @@
          </span>
          <el-select v-model="info.treeParentCode" placeholder="请选择">
            <el-option
              v-for="column in info.columns"
              :key="column.columnName"
              v-for="(column, index) in info.columns"
              :key="index"
              :label="column.columnName + '：' + column.columnComment"
              :value="column.columnName"
            ></el-option>
@@ -162,8 +163,47 @@
          </span>
          <el-select v-model="info.treeName" placeholder="请选择">
            <el-option
              v-for="column in info.columns"
              :key="column.columnName"
              v-for="(column, index) in info.columns"
              :key="index"
              :label="column.columnName + '：' + column.columnComment"
              :value="column.columnName"
            ></el-option>
          </el-select>
        </el-form-item>
      </el-col>
    </el-row>
    <el-row v-show="info.tplCategory == 'sub'">
      <h4 class="form-header">关联信息</h4>
      <el-col :span="12">
        <el-form-item>
          <span slot="label">
            å…³è”子表的表名
            <el-tooltip content="关联子表的表名， å¦‚：sys_user" placement="top">
              <i class="el-icon-question"></i>
            </el-tooltip>
          </span>
          <el-select v-model="info.subTableName" placeholder="请选择" @change="subSelectChange">
            <el-option
              v-for="(table, index) in tables"
              :key="index"
              :label="table.tableName + '：' + table.tableComment"
              :value="table.tableName"
            ></el-option>
          </el-select>
        </el-form-item>
      </el-col>
      <el-col :span="12">
        <el-form-item>
          <span slot="label">
            å­è¡¨å…³è”的外键名
            <el-tooltip content="子表关联的外键名， å¦‚：user_id" placement="top">
              <i class="el-icon-question"></i>
            </el-tooltip>
          </span>
          <el-select v-model="info.subTableFkName" placeholder="请选择">
            <el-option
              v-for="(column, index) in subColumns"
              :key="index"
              :label="column.columnName + '：' + column.columnComment"
              :value="column.columnName"
            ></el-option>
@@ -185,6 +225,10 @@
      type: Object,
      default: null
    },
    tables: {
      type: Array,
      default: null
    },
    menus: {
      type: Array,
      default: []
@@ -192,6 +236,7 @@
  },
  data() {
    return {
      subColumns: [],
      rules: {
        tplCategory: [
          { required: true, message: "请选择生成模板", trigger: "blur" }
@@ -212,6 +257,11 @@
    };
  },
  created() {},
  watch: {
    'info.subTableName': function(val) {
      this.setSubTableColumns(val);
    }
  },
  methods: {
    /** è½¬æ¢èœå•æ•°æ®ç»“æž„ */
    normalizer(node) {
@@ -223,6 +273,27 @@
        label: node.menuName,
        children: node.children
      };
    },
    /** é€‰æ‹©å­è¡¨åè§¦å‘ */
    subSelectChange(value) {
      this.info.subTableFkName = '';
    },
    /** é€‰æ‹©ç”Ÿæˆæ¨¡æ¿è§¦å‘ */
    tplSelectChange(value) {
      if(value !== 'sub') {
        this.info.subTableName = '';
        this.info.subTableFkName = '';
      }
    },
    /** è®¾ç½®å…³è”外键 */
    setSubTableColumns(value) {
      for (var item in this.tables) {
        const name = this.tables[item].tableName;
        if (value === name) {
          this.subColumns = this.tables[item].columns;
          break;
        }
      }
    }
  }
};

 ruoyi-ui/src/views/tool/gen/index.vue

@@ -84,7 +84,7 @@
    </el-row>

    <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55"></el-table-column>
      <el-table-column type="selection" align="center" width="55"></el-table-column>
      <el-table-column label="序号" type="index" width="50" align="center">
        <template slot-scope="scope">
          <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>

 sql/ry_20210108.sql

ÎļþÃû´Ó sql/ry_20201128.sql ÐÞ¸Ä
@@ -633,6 +633,8 @@
  table_id          bigint(20)      not null auto_increment    comment '编号',
  table_name        varchar(200)    default ''                 comment '表名称',
  table_comment     varchar(500)    default ''                 comment '表描述',
  sub_table_name    varchar(64)     default null               comment '关联子表的表名',
  sub_table_fk_name varchar(64)     default null               comment '子表关联的外键名',
  class_name        varchar(100)    default ''                 comment '实体类名称',
  tpl_category      varchar(200)    default 'crud'             comment '使用的模板（crud单表操作 tree树表操作）',
  package_name      varchar(100)                               comment '生成包路径',