代码生成同步保留必填/类型选项

RuoYi

2022-02-13 cfbbc7264eb4745f3de364b86c43390276dc845d

 src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java

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

        // 设置java字段名

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

        // 设置默认类型

        column.setJavaType(GenConstants.TYPE_STRING);

        column.setQueryType(GenConstants.QUERY_EQ);



        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))

@@ -111,10 +113,15 @@
        {

            column.setHtmlType(GenConstants.HTML_SELECT);

        }

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

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

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

        {

            column.setHtmlType(GenConstants.HTML_UPLOAD_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"))

@@ -145,8 +152,7 @@
    {

        int lastIndex = packageName.lastIndexOf(".");

        int nameLength = packageName.length();

        String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);

        return moduleName;

        return StringUtils.substring(packageName, lastIndex + 1, nameLength);

    }



    /**

@@ -159,8 +165,7 @@
    {

        int lastIndex = tableName.lastIndexOf("_");

        int nameLength = tableName.length();

        String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength);

        return businessName;

        return StringUtils.substring(tableName, lastIndex + 1, nameLength);

    }



    /**

@@ -249,4 +254,4 @@
            return 0;

        }

    }

}
}