优化权限认证注解

RuoYi

2021-10-16 d8da1b796c0bc63c917ce7ece9f2a4da2325b394

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java

@@ -40,13 +40,14 @@
        column.setCreateBy(table.getCreateBy());

        // 设置java字段名

        column.setJavaField(StringUtils.toCamelCase(columnName));

        // 设置默认类型

        column.setJavaType(GenConstants.TYPE_STRING);



        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType))

        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType))

        {

            column.setJavaType(GenConstants.TYPE_STRING);

            // 字符串长度超过500设置为文本域

            Integer columnLength = getColumnLength(column.getColumnType());

            String htmlType = columnLength >= 500 ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT;

            String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT;

            column.setHtmlType(htmlType);

        }

        else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType))

@@ -58,11 +59,11 @@
        {

            column.setHtmlType(GenConstants.HTML_INPUT);



            // 如果是浮点型

            // 如果是浮点型 统一用BigDecimal

            String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");

            if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)

            {

                column.setJavaType(GenConstants.TYPE_DOUBLE);

                column.setJavaType(GenConstants.TYPE_BIGDECIMAL);

            }

            // 如果是整形

            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10)

@@ -110,6 +111,21 @@
                || StringUtils.endsWithIgnoreCase(columnName, "sex"))

        {

            column.setHtmlType(GenConstants.HTML_SELECT);

        }

        // 图片字段设置图片上传控件

        else if (StringUtils.endsWithIgnoreCase(columnName, "image"))

        {

            column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);

        }

        // 文件字段设置文件上传控件

        else if (StringUtils.endsWithIgnoreCase(columnName, "file"))

        {

            column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);

        }

        // 内容字段设置富文本控件

        else if (StringUtils.endsWithIgnoreCase(columnName, "content"))

        {

            column.setHtmlType(GenConstants.HTML_EDITOR);

        }

    }



@@ -195,7 +211,7 @@
    /**

     * 关键字替换

     * 

     * @param name 需要被替换的名字

     * @param text 需要被替换的名字

     * @return 替换后的名字

     */

    public static String replaceText(String text)