Commit cc429d06 authored by hewei's avatar hewei

bugfix:类命名规范不应该使用官方驼峰命名规则方法,而应采用简单进行首字母大写就行;

parent 9167f9dc
...@@ -20,7 +20,6 @@ import com.itfsw.mybatis.generator.plugins.utils.BasePlugin; ...@@ -20,7 +20,6 @@ import com.itfsw.mybatis.generator.plugins.utils.BasePlugin;
import com.itfsw.mybatis.generator.plugins.utils.IntrospectedTableTools; import com.itfsw.mybatis.generator.plugins.utils.IntrospectedTableTools;
import org.mybatis.generator.api.IntrospectedTable; import org.mybatis.generator.api.IntrospectedTable;
import org.mybatis.generator.config.TableConfiguration; import org.mybatis.generator.config.TableConfiguration;
import org.mybatis.generator.internal.util.JavaBeansUtil;
import java.util.List; import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
...@@ -53,8 +52,8 @@ public class TableRenamePlugin extends BasePlugin { ...@@ -53,8 +52,8 @@ public class TableRenamePlugin extends BasePlugin {
} }
// 如果table配置了domainObjectName或者mapperName就不要再启动该插件了 // 如果table配置了domainObjectName或者mapperName就不要再启动该插件了
for (TableConfiguration tableConfiguration: context.getTableConfigurations()) { for (TableConfiguration tableConfiguration : context.getTableConfigurations()) {
if (tableConfiguration.getDomainObjectName() != null || tableConfiguration.getMapperName() != null){ if (tableConfiguration.getDomainObjectName() != null || tableConfiguration.getMapperName() != null) {
warnings.add("itfsw:插件" + this.getClass().getTypeName() + "插件请不要配合table的domainObjectName或者mapperName一起使用!"); warnings.add("itfsw:插件" + this.getClass().getTypeName() + "插件请不要配合table的domainObjectName或者mapperName一起使用!");
return false; return false;
} }
...@@ -79,7 +78,7 @@ public class TableRenamePlugin extends BasePlugin { ...@@ -79,7 +78,7 @@ public class TableRenamePlugin extends BasePlugin {
} catch (Exception e) { } catch (Exception e) {
logger.error("itfsw:插件" + this.getClass().getTypeName() + "使用tableOverride替换时异常!", e); logger.error("itfsw:插件" + this.getClass().getTypeName() + "使用tableOverride替换时异常!", e);
} }
} else if (getProperties().getProperty(PRE_SEARCH_STRING) != null){ } else if (getProperties().getProperty(PRE_SEARCH_STRING) != null) {
String searchString = getProperties().getProperty(PRE_SEARCH_STRING); String searchString = getProperties().getProperty(PRE_SEARCH_STRING);
String replaceString = getProperties().getProperty(PRE_REPLACE_STRING); String replaceString = getProperties().getProperty(PRE_REPLACE_STRING);
...@@ -87,8 +86,8 @@ public class TableRenamePlugin extends BasePlugin { ...@@ -87,8 +86,8 @@ public class TableRenamePlugin extends BasePlugin {
Pattern pattern = Pattern.compile(searchString); Pattern pattern = Pattern.compile(searchString);
Matcher matcher = pattern.matcher(domainObjectName); Matcher matcher = pattern.matcher(domainObjectName);
domainObjectName = matcher.replaceAll(replaceString); domainObjectName = matcher.replaceAll(replaceString);
// 命名规范化 // 命名规范化 首字母大写
domainObjectName = JavaBeansUtil.getCamelCaseString(domainObjectName, true); domainObjectName = upFirstWord(domainObjectName);
try { try {
IntrospectedTableTools.setDomainObjectName(introspectedTable, getContext(), domainObjectName); IntrospectedTableTools.setDomainObjectName(introspectedTable, getContext(), domainObjectName);
} catch (Exception e) { } catch (Exception e) {
...@@ -96,4 +95,13 @@ public class TableRenamePlugin extends BasePlugin { ...@@ -96,4 +95,13 @@ public class TableRenamePlugin extends BasePlugin {
} }
} }
} }
/**
* 字符串首字母大写
* @param str
* @return
*/
private String upFirstWord(String str) {
return str.substring(0, 1).toUpperCase() + str.substring(1);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment