github/SpringBootCodeGenerator
1
0
Fork 0
mirror of https://github.com/moshowgame/SpringBootCodeGenerator.git synced 2025-12-26 05:48:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #92 from gaohanghang/master

Browse Source 
1. 将 mybatis controller 模板里，类上 @RequestMapping 注解里的 url 改为首字母小写 2. 对 java 代码进行格式化，使其看上去更加美观
This commit is contained in:
Moshow郑锴 2020-10-10 17:52:15 +08:00 committed by GitHub
commit 59fae86bc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 767 additions and 719 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
generator-web/src/main/java/com/softdev/system/generator/GeneratorWebApplication.java
View File

@ -6,7 +6,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication @SpringBootApplication
public class GeneratorWebApplication { public class GeneratorWebApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(GeneratorWebApplication.class,args); SpringApplication.run(GeneratorWebApplication.class, args);
} }
} }

2
generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java
View File

@ -12,7 +12,7 @@ public class GlobalDefaultExceptionHandler {
@ExceptionHandler(Exception.class) @ExceptionHandler(Exception.class)
@ResponseBody @ResponseBody
public ReturnT defaultExceptionHandler(HttpServletRequest req,Exception e) { public ReturnT defaultExceptionHandler(HttpServletRequest req, Exception e) {
e.printStackTrace(); e.printStackTrace();
return ReturnT.ERROR(e.getMessage()); return ReturnT.ERROR(e.getMessage());
} }

1
generator-web/src/main/java/com/softdev/system/generator/config/ServerConfig.java
View File

@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.web.context.WebServerInitializedEvent; import org.springframework.boot.web.context.WebServerInitializedEvent;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.net.Inet4Address; import java.net.Inet4Address;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;

3
generator-web/src/main/java/com/softdev/system/generator/config/WebMvcConfig.java
View File

@ -17,7 +17,7 @@ import java.util.List;
@Configuration @Configuration
public class WebMvcConfig implements WebMvcConfigurer { public class WebMvcConfig implements WebMvcConfigurer {
/* @Override /* @Override
public void addCorsMappings(CorsRegistry registry) { public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**") registry.addMapping("/**")
.allowedOrigins("*") .allowedOrigins("*")
@ -46,4 +46,5 @@ public class WebMvcConfig implements WebMvcConfigurer {
converters.add(stringConverter); converters.add(stringConverter);
converters.add(fastConverter); converters.add(fastConverter);
} }
} }

25
generator-web/src/main/java/com/softdev/system/generator/controller/IndexController.java
View File

@ -18,6 +18,7 @@ import java.util.Map;
/** /**
* spring boot code generator * spring boot code generator
*
* @author zhengk/moshow * @author zhengk/moshow
*/ */
@Controller @Controller
@ -34,29 +35,37 @@ public class IndexController {
@PostMapping("/genCode") @PostMapping("/genCode")
@ResponseBody @ResponseBody
public ReturnT codeGenerate(@RequestBody ParamInfo paramInfo ) throws Exception { public ReturnT codeGenerate(@RequestBody ParamInfo paramInfo) throws Exception {
if (paramInfo.getTableSql().trim().length()<1) { if (paramInfo.getTableSql().trim().length() < 1) {
return ReturnT.ERROR("表结构信息不可为空"); return ReturnT.ERROR("表结构信息不可为空");
} }
//1.Parse Table Structure 表结构解析 //1.Parse Table Structure 表结构解析
ClassInfo classInfo = null; ClassInfo classInfo = null;
switch (paramInfo.getDataType()){ switch (paramInfo.getDataType()) {
//JSON模式：parse field from json string //JSON模式：parse field from json string
case "json":classInfo = TableParseUtil.processJsonToClassInfo(paramInfo);break; case "json":
classInfo = TableParseUtil.processJsonToClassInfo(paramInfo);
break;
//INSERT SQL模式：parse field from insert sql //INSERT SQL模式：parse field from insert sql
case "insert-sql":classInfo = TableParseUtil.processInsertSqlToClassInfo(paramInfo);break; case "insert-sql":
classInfo = TableParseUtil.processInsertSqlToClassInfo(paramInfo);
break;
//正则表达式模式（非完善版本）：parse sql by regex //正则表达式模式（非完善版本）：parse sql by regex
case "sql-regex":classInfo = TableParseUtil.processTableToClassInfoByRegex(paramInfo);break; case "sql-regex":
classInfo = TableParseUtil.processTableToClassInfoByRegex(paramInfo);
break;
//默认模式：default parse sql by java //默认模式：default parse sql by java
default : classInfo = TableParseUtil.processTableIntoClassInfo(paramInfo);break; default:
classInfo = TableParseUtil.processTableIntoClassInfo(paramInfo);
break;
} }
//2.Set the params 设置表格参数 //2.Set the params 设置表格参数
Map<String, Object> params = new HashMap<String, Object>(8); Map<String, Object> params = new HashMap<String, Object>(8);
params.put("classInfo", classInfo); params.put("classInfo", classInfo);
params.put("tableName", classInfo==null?System.currentTimeMillis():classInfo.getTableName()); params.put("tableName", classInfo == null ? System.currentTimeMillis() : classInfo.getTableName());
params.put("authorName", paramInfo.getAuthorName()); params.put("authorName", paramInfo.getAuthorName());
params.put("packageName", paramInfo.getPackageName()); params.put("packageName", paramInfo.getPackageName());
params.put("returnUtil", paramInfo.getReturnUtil()); params.put("returnUtil", paramInfo.getReturnUtil());

11
generator-web/src/main/java/com/softdev/system/generator/entity/ParamInfo.java
View File

@ -4,10 +4,12 @@ import lombok.Data;
/** /**
* Post data - ParamInfo * Post data - ParamInfo
*
* @author zhengkai.blog.csdn.net * @author zhengkai.blog.csdn.net
*/ */
@Data @Data
public class ParamInfo { public class ParamInfo {
private String tableSql; private String tableSql;
private String authorName; private String authorName;
private String packageName; private String packageName;
@ -18,9 +20,10 @@ public class ParamInfo {
private boolean swagger; private boolean swagger;
@Data @Data
public static class NAME_CASE_TYPE{ public static class NAME_CASE_TYPE {
public static String CAMEL_CASE="CamelCase"; public static String CAMEL_CASE = "CamelCase";
public static String UNDER_SCORE_CASE="UnderScoreCase"; public static String UNDER_SCORE_CASE = "UnderScoreCase";
public static String UPPER_UNDER_SCORE_CASE="UpperUnderScoreCase"; public static String UPPER_UNDER_SCORE_CASE = "UpperUnderScoreCase";
} }
} }

43
generator-web/src/main/java/com/softdev/system/generator/entity/ReturnT.java
View File

@ -6,10 +6,12 @@ import java.io.Serializable;
/** /**
* common returnT:公共返回封装类 * common returnT:公共返回封装类
*
* @author zhengkai.blog.csdn.net * @author zhengkai.blog.csdn.net
*/ */
@Data @Data
public class ReturnT implements Serializable { public class ReturnT implements Serializable {
public static final long serialVersionUID = 42L; public static final long serialVersionUID = 42L;
public static final int SUCCESS_CODE = 200; public static final int SUCCESS_CODE = 200;
@ -27,39 +29,50 @@ public class ReturnT implements Serializable {
this.code = code; this.code = code;
this.msg = msg; this.msg = msg;
} }
public ReturnT(int code, String msg,Object data) {
public ReturnT(int code, String msg, Object data) {
this.code = code; this.code = code;
this.msg = msg; this.msg = msg;
this.data = data; this.data = data;
} }
public ReturnT(Object data) { public ReturnT(Object data) {
this.code = SUCCESS_CODE; this.code = SUCCESS_CODE;
this.data = data; this.data = data;
} }
public ReturnT( Object data , int count ) {
public ReturnT(Object data, int count) {
this.code = PAGE_CODE; this.code = PAGE_CODE;
this.data = data; this.data = data;
this.count = count; this.count = count;
} }
public static ReturnT PAGE( Object data , int count){
return new ReturnT(data,count); public static ReturnT PAGE(Object data, int count) {
return new ReturnT(data, count);
} }
public static ReturnT PAGE( Object data , long count){
return new ReturnT(data,Integer.parseInt(count+"")); public static ReturnT PAGE(Object data, long count) {
return new ReturnT(data, Integer.parseInt(count + ""));
} }
public static ReturnT SUCCESS(){
return new ReturnT(SUCCESS_CODE,OPERATION_SUCCESS); public static ReturnT SUCCESS() {
return new ReturnT(SUCCESS_CODE, OPERATION_SUCCESS);
} }
public static ReturnT SUCCESS(String msg){
return new ReturnT(SUCCESS_CODE,msg); public static ReturnT SUCCESS(String msg) {
return new ReturnT(SUCCESS_CODE, msg);
} }
public static ReturnT SUCCESS(Object data){
public static ReturnT SUCCESS(Object data) {
return new ReturnT(data); return new ReturnT(data);
} }
public static ReturnT ERROR(String msg){
return new ReturnT(FAIL_CODE,msg); public static ReturnT ERROR(String msg) {
return new ReturnT(FAIL_CODE, msg);
} }
public static ReturnT ERROR(){
return new ReturnT(FAIL_CODE,OBJECT_NOT_FOUND); public static ReturnT ERROR() {
return new ReturnT(FAIL_CODE, OBJECT_NOT_FOUND);
} }
} }

3
generator-web/src/main/java/com/softdev/system/generator/service/GeneratorService.java
View File

@ -8,10 +8,11 @@ import java.util.Map;
/** /**
* GeneratorService * GeneratorService
*
* @author zhengkai.blog.csdn.net * @author zhengkai.blog.csdn.net
*/ */
public interface GeneratorService { public interface GeneratorService {
public Map<String,String> getResultByParams(Map<String, Object> params) throws IOException, TemplateException; public Map<String, String> getResultByParams(Map<String, Object> params) throws IOException, TemplateException;
} }

22
generator-web/src/main/java/com/softdev/system/generator/service/GeneratorServiceImpl.java
View File

@ -19,6 +19,7 @@ import java.util.stream.Collectors;
/** /**
* GeneratorService * GeneratorService
*
* @author zhengkai.blog.csdn.net * @author zhengkai.blog.csdn.net
*/ */
@Slf4j @Slf4j
@ -28,15 +29,17 @@ public class GeneratorServiceImpl implements GeneratorService {
@Autowired @Autowired
private FreemarkerUtil freemarkerTool; private FreemarkerUtil freemarkerTool;
String templateCpnfig=null; String templateCpnfig = null;
/** /**
* 从项目中的JSON文件读取String * 从项目中的JSON文件读取String
*
* @author zhengkai.blog.csdn.net * @author zhengkai.blog.csdn.net
*/ */
public String getTemplateConfig() throws IOException { public String getTemplateConfig() throws IOException {
templateCpnfig=null; templateCpnfig = null;
if(templateCpnfig!=null){ if (templateCpnfig != null) {
}else{ } else {
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("template.json"); InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("template.json");
templateCpnfig = new BufferedReader(new InputStreamReader(inputStream)) templateCpnfig = new BufferedReader(new InputStreamReader(inputStream))
.lines().collect(Collectors.joining(System.lineSeparator())); .lines().collect(Collectors.joining(System.lineSeparator()));
@ -45,18 +48,21 @@ public class GeneratorServiceImpl implements GeneratorService {
//log.info(JSON.toJSONString(templateCpnfig)); //log.info(JSON.toJSONString(templateCpnfig));
return templateCpnfig; return templateCpnfig;
} }
/** /**
* 根据配置的Template模板进行遍历解析，得到生成好的String * 根据配置的Template模板进行遍历解析，得到生成好的String
*
* @author zhengkai.blog.csdn.net * @author zhengkai.blog.csdn.net
*/ */
@Override @Override
public Map<String, String> getResultByParams(Map<String, Object> params) throws IOException, TemplateException { public Map<String, String> getResultByParams(Map<String, Object> params) throws IOException, TemplateException {
Map<String, String> result = new LinkedHashMap<>(32); Map<String, String> result = new LinkedHashMap<>(32);
result.put("tableName",params.get("tableName")+""); result.put("tableName", params.get("tableName") + "");
List<TemplateConfig> templateConfigList = JSON.parseArray(getTemplateConfig(),TemplateConfig.class); List<TemplateConfig> templateConfigList = JSON.parseArray(getTemplateConfig(), TemplateConfig.class);
for (TemplateConfig item:templateConfigList){ for (TemplateConfig item : templateConfigList) {
result.put(item.getName(), freemarkerTool.processString(item.getGroup()+"/"+item.getName()+".ftl", params)); result.put(item.getName(), freemarkerTool.processString(item.getGroup() + "/" + item.getName() + ".ftl", params));
} }
return result; return result;
} }
} }

3
generator-web/src/main/java/com/softdev/system/generator/util/CodeGenerateException.java
View File

@ -4,7 +4,9 @@ package com.softdev.system.generator.util;
* @author xuxueli 2018-05-02 21:10:28 * @author xuxueli 2018-05-02 21:10:28
*/ */
public class CodeGenerateException extends RuntimeException { public class CodeGenerateException extends RuntimeException {
private static final long serialVersionUID = 42L; private static final long serialVersionUID = 42L;
public CodeGenerateException() { public CodeGenerateException() {
super(); super();
} }
@ -26,4 +28,5 @@ public class CodeGenerateException extends RuntimeException {
boolean writableStackTrace) { boolean writableStackTrace) {
super(message, cause, enableSuppression, writableStackTrace); super(message, cause, enableSuppression, writableStackTrace);
} }
} }

11
generator-web/src/main/java/com/softdev/system/generator/util/FreemarkerUtil.java
View File

@ -23,23 +23,23 @@ import java.util.Map;
@Component @Component
public class FreemarkerUtil { public class FreemarkerUtil {
@Autowired @Autowired
private Configuration configuration; private Configuration configuration;
/** /**
* 传入需要转义的字符串进行转义 * 传入需要转义的字符串进行转义
* 20200503 zhengkai.blog.csdn.net * 20200503 zhengkai.blog.csdn.net
* */ */
public static String escapeString(String originStr){ public static String escapeString(String originStr) {
return originStr.replaceAll("井","\\#").replaceAll("￥","\\$"); return originStr.replaceAll("井", "\\#").replaceAll("￥", "\\$");
} }
/** /**
* freemarker config * freemarker config
*/ */
private static Configuration freemarkerConfig = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS); private static Configuration freemarkerConfig = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
static{
static {
try { try {
//2020-06-21 zhengkai 修复path问题导致jar无法运行而本地项目可以运行的bug //2020-06-21 zhengkai 修复path问题导致jar无法运行而本地项目可以运行的bug
freemarkerConfig.setClassForTemplateLoading(FreemarkerUtil.class, "/templates/code-generator"); freemarkerConfig.setClassForTemplateLoading(FreemarkerUtil.class, "/templates/code-generator");
@ -89,5 +89,4 @@ public class FreemarkerUtil {
return htmlText; return htmlText;
} }
} }

3
generator-web/src/main/java/com/softdev/system/generator/util/StringUtils.java
View File

@ -25,7 +25,7 @@ public class StringUtils {
*/ */
public static String lowerCaseFirst(String str) { public static String lowerCaseFirst(String str) {
//2019-2-10 解决StringUtils.lowerCaseFirst潜在的NPE异常@liutf //2019-2-10 解决StringUtils.lowerCaseFirst潜在的NPE异常@liutf
return (str!=null&&str.length()>1)?str.substring(0, 1).toLowerCase() + str.substring(1):""; return (str != null && str.length() > 1) ? str.substring(0, 1).toLowerCase() + str.substring(1) : "";
} }
/** /**
@ -58,4 +58,5 @@ public class StringUtils {
public static void main(String[] args) { public static void main(String[] args) {
} }
} }

259
generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java
View File

@ -20,56 +20,58 @@ import java.util.regex.Pattern;
/** /**
* 表格解析Util * 表格解析Util
*
* @author zhengkai.blog.csdn.net * @author zhengkai.blog.csdn.net
*/ */
public class TableParseUtil { public class TableParseUtil {
/** /**
* 解析DDL SQL生成类信息 * 解析DDL SQL生成类信息
*
* @param paramInfo * @param paramInfo
* @return * @return
*/ */
public static ClassInfo processTableIntoClassInfo(ParamInfo paramInfo) public static ClassInfo processTableIntoClassInfo(ParamInfo paramInfo)
throws IOException { throws IOException {
//process the param //process the param
String tableSql=paramInfo.getTableSql(); String tableSql = paramInfo.getTableSql();
String nameCaseType=paramInfo.getNameCaseType(); String nameCaseType = paramInfo.getNameCaseType();
String tinyintTransType=paramInfo.getTinyintTransType(); String tinyintTransType = paramInfo.getTinyintTransType();
if (tableSql==null || tableSql.trim().length()==0) { if (tableSql == null || tableSql.trim().length() == 0) {
throw new CodeGenerateException("Table structure can not be empty. 表结构不能为空。"); throw new CodeGenerateException("Table structure can not be empty. 表结构不能为空。");
} }
//deal with special character //deal with special character
tableSql = tableSql.trim().replaceAll("'","`").replaceAll("\"","`").replaceAll("，",",").toLowerCase(); tableSql = tableSql.trim().replaceAll("'", "`").replaceAll("\"", "`").replaceAll("，", ",").toLowerCase();
//deal with java string copy \n" //deal with java string copy \n"
tableSql = tableSql.trim().replaceAll("\\\\n`","").replaceAll("\\+","").replaceAll("``","`").replaceAll("\\\\",""); tableSql = tableSql.trim().replaceAll("\\\\n`", "").replaceAll("\\+", "").replaceAll("``", "`").replaceAll("\\\\", "");
// table Name // table Name
String tableName = null; String tableName = null;
if (tableSql.contains("TABLE") && tableSql.contains("(")) { if (tableSql.contains("TABLE") && tableSql.contains("(")) {
tableName = tableSql.substring(tableSql.indexOf("TABLE")+5, tableSql.indexOf("(")); tableName = tableSql.substring(tableSql.indexOf("TABLE") + 5, tableSql.indexOf("("));
} else if (tableSql.contains("table") && tableSql.contains("(")) { } else if (tableSql.contains("table") && tableSql.contains("(")) {
tableName = tableSql.substring(tableSql.indexOf("table")+5, tableSql.indexOf("(")); tableName = tableSql.substring(tableSql.indexOf("table") + 5, tableSql.indexOf("("));
} else { } else {
throw new CodeGenerateException("Table structure incorrect.表结构不正确。"); throw new CodeGenerateException("Table structure incorrect.表结构不正确。");
} }
//新增处理create table if not exists members情况 //新增处理create table if not exists members情况
if (tableName.contains("if not exists")) { if (tableName.contains("if not exists")) {
tableName=tableName.replaceAll("if not exists",""); tableName = tableName.replaceAll("if not exists", "");
} }
if (tableName.contains("`")) { if (tableName.contains("`")) {
tableName = tableName.substring(tableName.indexOf("`")+1, tableName.lastIndexOf("`")); tableName = tableName.substring(tableName.indexOf("`") + 1, tableName.lastIndexOf("`"));
}else{ } else {
//空格开头的，需要替换掉\n\t空格 //空格开头的，需要替换掉\n\t空格
tableName=tableName.replaceAll(" ","").replaceAll("\n","").replaceAll("\t",""); tableName = tableName.replaceAll(" ", "").replaceAll("\n", "").replaceAll("\t", "");
} }
//优化对byeas`.`ct_bd_customerdiscount这种命名的支持 //优化对byeas`.`ct_bd_customerdiscount这种命名的支持
if(tableName.contains("`.`")){ if (tableName.contains("`.`")) {
tableName=tableName.substring(tableName.indexOf("`.`")+3); tableName = tableName.substring(tableName.indexOf("`.`") + 3);
}else if(tableName.contains(".")){ } else if (tableName.contains(".")) {
//优化对likeu.members这种命名的支持 //优化对likeu.members这种命名的支持
tableName=tableName.substring(tableName.indexOf(".")+1); tableName = tableName.substring(tableName.indexOf(".") + 1);
} }
// class Name // class Name
String className = StringUtils.upperCaseFirst(StringUtils.underlineToCamelCase(tableName)); String className = StringUtils.upperCaseFirst(StringUtils.underlineToCamelCase(tableName));
@ -81,33 +83,33 @@ public class TableParseUtil {
String classComment = null; String classComment = null;
//mysql是comment=,pgsql/oracle是comment on table, //mysql是comment=,pgsql/oracle是comment on table,
//2020-05-25 优化表备注的获取逻辑 //2020-05-25 优化表备注的获取逻辑
if (tableSql.contains("comment=")||tableSql.contains("comment on table")) { if (tableSql.contains("comment=") || tableSql.contains("comment on table")) {
String classCommentTmp = (tableSql.contains("comment="))? String classCommentTmp = (tableSql.contains("comment=")) ?
tableSql.substring(tableSql.lastIndexOf("comment=")+8).trim():tableSql.substring(tableSql.lastIndexOf("comment on table")+17).trim(); tableSql.substring(tableSql.lastIndexOf("comment=") + 8).trim() : tableSql.substring(tableSql.lastIndexOf("comment on table") + 17).trim();
if (classCommentTmp.contains("`")) { if (classCommentTmp.contains("`")) {
classCommentTmp = classCommentTmp.substring(classCommentTmp.indexOf("`")+1); classCommentTmp = classCommentTmp.substring(classCommentTmp.indexOf("`") + 1);
classCommentTmp = classCommentTmp.substring(0,classCommentTmp.indexOf("`")); classCommentTmp = classCommentTmp.substring(0, classCommentTmp.indexOf("`"));
classComment = classCommentTmp; classComment = classCommentTmp;
}else{ } else {
//非常规的没法分析 //非常规的没法分析
classComment = className; classComment = className;
} }
}else{ } else {
//修复表备注为空问题 //修复表备注为空问题
classComment = tableName; classComment = tableName;
} }
//如果备注跟;混在一起，需要替换掉 //如果备注跟;混在一起，需要替换掉
classComment=classComment.replaceAll(";",""); classComment = classComment.replaceAll(";", "");
// field List // field List
List<FieldInfo> fieldList = new ArrayList<FieldInfo>(); List<FieldInfo> fieldList = new ArrayList<FieldInfo>();
// 正常( ) 内的一定是字段相关的定义。 // 正常( ) 内的一定是字段相关的定义。
String fieldListTmp = tableSql.substring(tableSql.indexOf("(")+1, tableSql.lastIndexOf(")")); String fieldListTmp = tableSql.substring(tableSql.indexOf("(") + 1, tableSql.lastIndexOf(")"));
// 匹配 comment，替换备注里的小逗号, 防止不小心被当成切割符号切割 // 匹配 comment，替换备注里的小逗号, 防止不小心被当成切割符号切割
String commentPattenStr1="comment `(.*?)\\`"; String commentPattenStr1 = "comment `(.*?)\\`";
Matcher matcher1 = Pattern.compile(commentPattenStr1).matcher(fieldListTmp); Matcher matcher1 = Pattern.compile(commentPattenStr1).matcher(fieldListTmp);
while(matcher1.find()){ while (matcher1.find()) {
String commentTmp = matcher1.group(); String commentTmp = matcher1.group();
//2018-9-27 zhengk 不替换，只处理，支持COMMENT评论里面多种注释 //2018-9-27 zhengk 不替换，只处理，支持COMMENT评论里面多种注释
@ -119,9 +121,9 @@ public class TableParseUtil {
} }
} }
//2018-10-18 zhengkai 新增支持double(10, 2)等类型中有英文逗号的特殊情况 //2018-10-18 zhengkai 新增支持double(10, 2)等类型中有英文逗号的特殊情况
String commentPattenStr2="\\`(.*?)\\`"; String commentPattenStr2 = "\\`(.*?)\\`";
Matcher matcher2 = Pattern.compile(commentPattenStr2).matcher(fieldListTmp); Matcher matcher2 = Pattern.compile(commentPattenStr2).matcher(fieldListTmp);
while(matcher2.find()){ while (matcher2.find()) {
String commentTmp2 = matcher2.group(); String commentTmp2 = matcher2.group();
if (commentTmp2.contains(",")) { if (commentTmp2.contains(",")) {
String commentTmpFinal = commentTmp2.replaceAll(",", "，").replaceAll("\\(", "（").replaceAll("\\)", "）"); String commentTmpFinal = commentTmp2.replaceAll(",", "，").replaceAll("\\(", "（").replaceAll("\\)", "）");
@ -129,9 +131,9 @@ public class TableParseUtil {
} }
} }
//2018-10-18 zhengkai 新增支持double(10, 2)等类型中有英文逗号的特殊情况 //2018-10-18 zhengkai 新增支持double(10, 2)等类型中有英文逗号的特殊情况
String commentPattenStr3="\\((.*?)\\)"; String commentPattenStr3 = "\\((.*?)\\)";
Matcher matcher3 = Pattern.compile(commentPattenStr3).matcher(fieldListTmp); Matcher matcher3 = Pattern.compile(commentPattenStr3).matcher(fieldListTmp);
while(matcher3.find()){ while (matcher3.find()) {
String commentTmp3 = matcher3.group(); String commentTmp3 = matcher3.group();
if (commentTmp3.contains(",")) { if (commentTmp3.contains(",")) {
String commentTmpFinal = commentTmp3.replaceAll(",", "，"); String commentTmpFinal = commentTmp3.replaceAll(",", "，");
@ -140,57 +142,58 @@ public class TableParseUtil {
} }
String[] fieldLineList = fieldListTmp.split(","); String[] fieldLineList = fieldListTmp.split(",");
if (fieldLineList.length > 0) { if (fieldLineList.length > 0) {
int i=0; int i = 0;
//i为了解决primary key关键字出现的地方，出现在前3行，一般和id有关 //i为了解决primary key关键字出现的地方，出现在前3行，一般和id有关
for (String columnLine :fieldLineList) { for (String columnLine : fieldLineList) {
i++; i++;
columnLine = columnLine.replaceAll("\n","").replaceAll("\t","").trim(); columnLine = columnLine.replaceAll("\n", "").replaceAll("\t", "").trim();
// `userid` int(11) NOT NULL AUTO_INCREMENT COMMENT '用户ID', // `userid` int(11) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
// 2018-9-18 zhengk 修改为contains，提升匹配率和匹配不按照规矩出牌的语句 // 2018-9-18 zhengk 修改为contains，提升匹配率和匹配不按照规矩出牌的语句
// 2018-11-8 zhengkai 修复tornadoorz反馈的KEY FK_permission_id (permission_id),KEY FK_role_id (role_id)情况 // 2018-11-8 zhengkai 修复tornadoorz反馈的KEY FK_permission_id (permission_id),KEY FK_role_id (role_id)情况
// 2019-2-22 zhengkai 要在条件中使用复杂的表达式 // 2019-2-22 zhengkai 要在条件中使用复杂的表达式
// 2019-4-29 zhengkai 优化对普通和特殊storage关键字的判断（感谢@AhHeadFloating的反馈 ） // 2019-4-29 zhengkai 优化对普通和特殊storage关键字的判断（感谢@AhHeadFloating的反馈 ）
boolean specialFlag=(!columnLine.contains("key ")&&!columnLine.contains("constraint")&&!columnLine.contains("using")&&!columnLine.contains("unique") boolean specialFlag = (!columnLine.contains("key ") && !columnLine.contains("constraint") && !columnLine.contains("using") && !columnLine.contains("unique")
&&!(columnLine.contains("primary ")&&columnLine.indexOf("storage")+3>columnLine.indexOf("(")) && !(columnLine.contains("primary ") && columnLine.indexOf("storage") + 3 > columnLine.indexOf("("))
&&!columnLine.contains("pctincrease") && !columnLine.contains("pctincrease")
&&!columnLine.contains("buffer_pool")&&!columnLine.contains("tablespace") && !columnLine.contains("buffer_pool") && !columnLine.contains("tablespace")
&&!(columnLine.contains("primary ")&&i>3)); && !(columnLine.contains("primary ") && i > 3));
if (specialFlag){ if (specialFlag) {
//如果是oracle的number(x,x)，可能出现最后分割残留的,x)，这里做排除处理 //如果是oracle的number(x,x)，可能出现最后分割残留的,x)，这里做排除处理
if(columnLine.length()<5) {continue;} if (columnLine.length() < 5) {
continue;
}
//2018-9-16 zhengkai 支持'符号以及空格的oracle语句// userid` int(11) NOT NULL AUTO_INCREMENT COMMENT '用户ID', //2018-9-16 zhengkai 支持'符号以及空格的oracle语句// userid` int(11) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
String columnName = ""; String columnName = "";
columnLine=columnLine.replaceAll("`"," ").replaceAll("\""," ").replaceAll("'","").replaceAll(" "," ").trim(); columnLine = columnLine.replaceAll("`", " ").replaceAll("\"", " ").replaceAll("'", "").replaceAll(" ", " ").trim();
//如果遇到username varchar(65) default '' not null,这种情况，判断第一个空格是否比第一个引号前 //如果遇到username varchar(65) default '' not null,这种情况，判断第一个空格是否比第一个引号前
columnName = columnLine.substring(0, columnLine.indexOf(" ")); columnName = columnLine.substring(0, columnLine.indexOf(" "));
// field Name // field Name
// 2019-09-08 yj 添加是否下划线转换为驼峰的判断 // 2019-09-08 yj 添加是否下划线转换为驼峰的判断
String fieldName=null; String fieldName = null;
if(ParamInfo.NAME_CASE_TYPE.CAMEL_CASE.equals(nameCaseType)){ if (ParamInfo.NAME_CASE_TYPE.CAMEL_CASE.equals(nameCaseType)) {
fieldName = StringUtils.lowerCaseFirst(StringUtils.underlineToCamelCase(columnName)); fieldName = StringUtils.lowerCaseFirst(StringUtils.underlineToCamelCase(columnName));
if (fieldName.contains("_")) { if (fieldName.contains("_")) {
fieldName = fieldName.replaceAll("_", ""); fieldName = fieldName.replaceAll("_", "");
} }
}else if(ParamInfo.NAME_CASE_TYPE.UNDER_SCORE_CASE.equals(nameCaseType)){ } else if (ParamInfo.NAME_CASE_TYPE.UNDER_SCORE_CASE.equals(nameCaseType)) {
fieldName = StringUtils.lowerCaseFirst(columnName); fieldName = StringUtils.lowerCaseFirst(columnName);
}else if(ParamInfo.NAME_CASE_TYPE.UPPER_UNDER_SCORE_CASE.equals(nameCaseType)){ } else if (ParamInfo.NAME_CASE_TYPE.UPPER_UNDER_SCORE_CASE.equals(nameCaseType)) {
fieldName = StringUtils.lowerCaseFirst(columnName.toUpperCase()); fieldName = StringUtils.lowerCaseFirst(columnName.toUpperCase());
}else{ } else {
fieldName=columnName; fieldName = columnName;
} }
// field class // field class
columnLine = columnLine.substring(columnLine.indexOf("`")+1).trim(); columnLine = columnLine.substring(columnLine.indexOf("`") + 1).trim();
// int(11) NOT NULL AUTO_INCREMENT COMMENT '用户ID', // int(11) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
String fieldClass = Object.class.getSimpleName(); String fieldClass = Object.class.getSimpleName();
//2018-9-16 zhengk 补充char/clob/blob/json等类型，如果类型未知，默认为String //2018-9-16 zhengk 补充char/clob/blob/json等类型，如果类型未知，默认为String
//2018-11-22 lshz0088 处理字段类型的时候，不严谨columnLine.contains(" int") 类似这种的，可在前后适当加一些空格之类的加以区分，否则当我的字段包含这些字符的时候，产生类型判断问题。 //2018-11-22 lshz0088 处理字段类型的时候，不严谨columnLine.contains(" int") 类似这种的，可在前后适当加一些空格之类的加以区分，否则当我的字段包含这些字符的时候，产生类型判断问题。
//2020-05-03 MOSHOW.K.ZHENG 优化对所有类型的处理 //2020-05-03 MOSHOW.K.ZHENG 优化对所有类型的处理
if (columnLine.contains(" tinyint") ) { if (columnLine.contains(" tinyint")) {
//20191115 MOSHOW.K.ZHENG 支持对tinyint的特殊处理 //20191115 MOSHOW.K.ZHENG 支持对tinyint的特殊处理
fieldClass=tinyintTransType; fieldClass = tinyintTransType;
} } else if (columnLine.contains(" int") || columnLine.contains(" smallint")) {
else if (columnLine.contains(" int") || columnLine.contains(" smallint")) {
fieldClass = Integer.class.getSimpleName(); fieldClass = Integer.class.getSimpleName();
} else if (columnLine.contains(" bigint")) { } else if (columnLine.contains(" bigint")) {
fieldClass = Long.class.getSimpleName(); fieldClass = Long.class.getSimpleName();
@ -200,16 +203,16 @@ public class TableParseUtil {
fieldClass = Double.class.getSimpleName(); fieldClass = Double.class.getSimpleName();
} else if (columnLine.contains(" time") || columnLine.contains(" date") || columnLine.contains(" datetime") || columnLine.contains(" timestamp")) { } else if (columnLine.contains(" time") || columnLine.contains(" date") || columnLine.contains(" datetime") || columnLine.contains(" timestamp")) {
fieldClass = Date.class.getSimpleName(); fieldClass = Date.class.getSimpleName();
} else if (columnLine.contains(" varchar") || columnLine.contains(" text")|| columnLine.contains(" char") } else if (columnLine.contains(" varchar") || columnLine.contains(" text") || columnLine.contains(" char")
|| columnLine.contains(" clob")||columnLine.contains(" blob")||columnLine.contains(" json")) { || columnLine.contains(" clob") || columnLine.contains(" blob") || columnLine.contains(" json")) {
fieldClass = String.class.getSimpleName(); fieldClass = String.class.getSimpleName();
} else if (columnLine.contains(" decimal")||columnLine.contains(" number")) { } else if (columnLine.contains(" decimal") || columnLine.contains(" number")) {
//2018-11-22 lshz0088 建议对number类型增加int，long，BigDecimal的区分判断 //2018-11-22 lshz0088 建议对number类型增加int，long，BigDecimal的区分判断
//如果startKh大于等于0，则表示有设置取值范围 //如果startKh大于等于0，则表示有设置取值范围
int startKh=columnLine.indexOf("("); int startKh = columnLine.indexOf("(");
if(startKh>=0){ if (startKh >= 0) {
int endKh=columnLine.indexOf(")",startKh); int endKh = columnLine.indexOf(")", startKh);
String[] fanwei=columnLine.substring(startKh+1,endKh).split("，"); String[] fanwei = columnLine.substring(startKh + 1, endKh).split("，");
//2019-1-5 zhengk 修复@arthaschan反馈的超出范围错误 //2019-1-5 zhengk 修复@arthaschan反馈的超出范围错误
//System.out.println("fanwei"+ JSON.toJSONString(fanwei)); //System.out.println("fanwei"+ JSON.toJSONString(fanwei));
// //number(20,6) fanwei["20","6"] // //number(20,6) fanwei["20","6"]
@ -217,22 +220,22 @@ public class TableParseUtil {
// //number(20,0) fanwei["20","0"] // //number(20,0) fanwei["20","0"]
// //number(20) fanwei["20"] // //number(20) fanwei["20"]
//如果括号里是1位或者2位且第二位为0，则进行特殊处理。只有有小数位，都设置为BigDecimal。 //如果括号里是1位或者2位且第二位为0，则进行特殊处理。只有有小数位，都设置为BigDecimal。
if((fanwei.length>1&&"0".equals(fanwei[1]))||fanwei.length==1){ if ((fanwei.length > 1 && "0".equals(fanwei[1])) || fanwei.length == 1) {
int length=Integer.parseInt(fanwei[0]); int length = Integer.parseInt(fanwei[0]);
if(fanwei.length>1) { if (fanwei.length > 1) {
length=Integer.valueOf(fanwei[1]); length = Integer.valueOf(fanwei[1]);
} }
//数字范围9位及一下用Integer，大的用Long //数字范围9位及一下用Integer，大的用Long
if(length<=9){ if (length <= 9) {
fieldClass = Integer.class.getSimpleName(); fieldClass = Integer.class.getSimpleName();
}else{ } else {
fieldClass = Long.class.getSimpleName(); fieldClass = Long.class.getSimpleName();
} }
}else{ } else {
//有小数位数一律使用BigDecimal //有小数位数一律使用BigDecimal
fieldClass = BigDecimal.class.getSimpleName(); fieldClass = BigDecimal.class.getSimpleName();
} }
}else{ } else {
fieldClass = BigDecimal.class.getSimpleName(); fieldClass = BigDecimal.class.getSimpleName();
} }
} else if (columnLine.contains(" boolean")) { } else if (columnLine.contains(" boolean")) {
@ -244,33 +247,33 @@ public class TableParseUtil {
// field comment，MySQL的一般位于field行，而pgsql和oralce多位于后面。 // field comment，MySQL的一般位于field行，而pgsql和oralce多位于后面。
String fieldComment = null; String fieldComment = null;
if(tableSql.contains("comment on column")&&(tableSql.contains("."+columnName+" is ")||tableSql.contains(".`"+columnName+"` is"))){ if (tableSql.contains("comment on column") && (tableSql.contains("." + columnName + " is ") || tableSql.contains(".`" + columnName + "` is"))) {
//新增对pgsql/oracle的字段备注支持 //新增对pgsql/oracle的字段备注支持
//COMMENT ON COLUMN public.check_info.check_name IS '检查者名称'; //COMMENT ON COLUMN public.check_info.check_name IS '检查者名称';
//2018-11-22 lshz0088 正则表达式的点号前面应该加上两个反斜杠，否则会认为是任意字符 //2018-11-22 lshz0088 正则表达式的点号前面应该加上两个反斜杠，否则会认为是任意字符
//2019-4-29 zhengkai 优化对oracle注释comment on column的支持（@liukex） //2019-4-29 zhengkai 优化对oracle注释comment on column的支持（@liukex）
tableSql=tableSql.replaceAll(".`"+columnName+"` is","."+columnName+" is"); tableSql = tableSql.replaceAll(".`" + columnName + "` is", "." + columnName + " is");
Matcher columnCommentMatcher = Pattern.compile("\\."+columnName+" is `").matcher(tableSql); Matcher columnCommentMatcher = Pattern.compile("\\." + columnName + " is `").matcher(tableSql);
fieldComment=columnName; fieldComment = columnName;
while(columnCommentMatcher.find()){ while (columnCommentMatcher.find()) {
String columnCommentTmp = columnCommentMatcher.group(); String columnCommentTmp = columnCommentMatcher.group();
//System.out.println(columnCommentTmp); //System.out.println(columnCommentTmp);
fieldComment = tableSql.substring(tableSql.indexOf(columnCommentTmp)+columnCommentTmp.length()).trim(); fieldComment = tableSql.substring(tableSql.indexOf(columnCommentTmp) + columnCommentTmp.length()).trim();
fieldComment = fieldComment.substring(0,fieldComment.indexOf("`")).trim(); fieldComment = fieldComment.substring(0, fieldComment.indexOf("`")).trim();
} }
}else if (columnLine.contains(" comment")) { } else if (columnLine.contains(" comment")) {
//20200518 zhengkai 修复包含comment关键字的问题 //20200518 zhengkai 修复包含comment关键字的问题
String commentTmp = columnLine.substring(columnLine.lastIndexOf("comment")+7).trim(); String commentTmp = columnLine.substring(columnLine.lastIndexOf("comment") + 7).trim();
// '用户ID', // '用户ID',
if (commentTmp.contains("`") || commentTmp.indexOf("`")!=commentTmp.lastIndexOf("`")) { if (commentTmp.contains("`") || commentTmp.indexOf("`") != commentTmp.lastIndexOf("`")) {
commentTmp = commentTmp.substring(commentTmp.indexOf("`")+1, commentTmp.lastIndexOf("`")); commentTmp = commentTmp.substring(commentTmp.indexOf("`") + 1, commentTmp.lastIndexOf("`"));
} }
//解决最后一句是评论，无主键且连着)的问题:album_id int(3) default '1' null comment '相册id：0 代表头像 1代表照片墙') //解决最后一句是评论，无主键且连着)的问题:album_id int(3) default '1' null comment '相册id：0 代表头像 1代表照片墙')
if(commentTmp.contains(")")){ if (commentTmp.contains(")")) {
commentTmp = commentTmp.substring(0, commentTmp.lastIndexOf(")")+1); commentTmp = commentTmp.substring(0, commentTmp.lastIndexOf(")") + 1);
} }
fieldComment = commentTmp; fieldComment = commentTmp;
}else{ } else {
//修复comment不存在导致报错的问题 //修复comment不存在导致报错的问题
fieldComment = columnName; fieldComment = columnName;
} }
@ -298,28 +301,30 @@ public class TableParseUtil {
return codeJavaInfo; return codeJavaInfo;
} }
/** /**
* 解析JSON生成类信息 * 解析JSON生成类信息
*
* @param paramInfo * @param paramInfo
* @return * @return
*/ */
public static ClassInfo processJsonToClassInfo(ParamInfo paramInfo){ public static ClassInfo processJsonToClassInfo(ParamInfo paramInfo) {
ClassInfo codeJavaInfo = new ClassInfo(); ClassInfo codeJavaInfo = new ClassInfo();
codeJavaInfo.setTableName("JsonDto"); codeJavaInfo.setTableName("JsonDto");
codeJavaInfo.setClassName("JsonDto"); codeJavaInfo.setClassName("JsonDto");
codeJavaInfo.setClassComment("JsonDto"); codeJavaInfo.setClassComment("JsonDto");
//support children json if forget to add '{' in front of json //support children json if forget to add '{' in front of json
if(paramInfo.getTableSql().trim().startsWith("\"")){ if (paramInfo.getTableSql().trim().startsWith("\"")) {
paramInfo.setTableSql("{"+paramInfo.getTableSql()); paramInfo.setTableSql("{" + paramInfo.getTableSql());
} }
if(JSON.isValid(paramInfo.getTableSql())){ if (JSON.isValid(paramInfo.getTableSql())) {
if(paramInfo.getTableSql().trim().startsWith("{")){ if (paramInfo.getTableSql().trim().startsWith("{")) {
JSONObject jsonObject = JSONObject.parseObject(paramInfo.getTableSql().trim()); JSONObject jsonObject = JSONObject.parseObject(paramInfo.getTableSql().trim());
//parse FieldList by JSONObject //parse FieldList by JSONObject
codeJavaInfo.setFieldList(processJsonObjectToFieldList(jsonObject)); codeJavaInfo.setFieldList(processJsonObjectToFieldList(jsonObject));
}else if(paramInfo.getTableSql().trim().startsWith("[")){ } else if (paramInfo.getTableSql().trim().startsWith("[")) {
JSONArray jsonArray=JSONArray.parseArray(paramInfo.getTableSql().trim()); JSONArray jsonArray = JSONArray.parseArray(paramInfo.getTableSql().trim());
//parse FieldList by JSONObject //parse FieldList by JSONObject
codeJavaInfo.setFieldList(processJsonObjectToFieldList(jsonArray.getJSONObject(0))); codeJavaInfo.setFieldList(processJsonObjectToFieldList(jsonArray.getJSONObject(0)));
} }
@ -327,48 +332,50 @@ public class TableParseUtil {
return codeJavaInfo; return codeJavaInfo;
} }
/** /**
* parse SQL by regex * parse SQL by regex
* @author https://github.com/ydq *
* @param paramInfo * @param paramInfo
* @return * @return
* @author https://github.com/ydq
*/ */
public static ClassInfo processTableToClassInfoByRegex(ParamInfo paramInfo){ public static ClassInfo processTableToClassInfoByRegex(ParamInfo paramInfo) {
// field List // field List
List<FieldInfo> fieldList = new ArrayList<FieldInfo>(); List<FieldInfo> fieldList = new ArrayList<FieldInfo>();
//return classInfo //return classInfo
ClassInfo codeJavaInfo = new ClassInfo(); ClassInfo codeJavaInfo = new ClassInfo();
//匹配整个ddl，将ddl分为表名，列sql部分，表注释 //匹配整个ddl，将ddl分为表名，列sql部分，表注释
String DDL_PATTEN_STR="\\s*create\\s+table\\s+(?<tableName>\\S+)[^\\(]*\\((?<columnsSQL>[\\s\\S]+)\\)[^\\)]+?(comment\\s*(=|on\\s+table)\\s*'(?<tableComment>.*?)'\\s*;?)?$"; String DDL_PATTEN_STR = "\\s*create\\s+table\\s+(?<tableName>\\S+)[^\\(]*\\((?<columnsSQL>[\\s\\S]+)\\)[^\\)]+?(comment\\s*(=|on\\s+table)\\s*'(?<tableComment>.*?)'\\s*;?)?$";
Pattern DDL_PATTERN = Pattern.compile(DDL_PATTEN_STR, Pattern.CASE_INSENSITIVE); Pattern DDL_PATTERN = Pattern.compile(DDL_PATTEN_STR, Pattern.CASE_INSENSITIVE);
//匹配列sql部分，分别解析每一列的列名 类型 和列注释 //匹配列sql部分，分别解析每一列的列名 类型 和列注释
String COL_PATTERN_STR="\\s*(?<fieldName>\\S+)\\s+(?<fieldType>\\w+)\\s*(?:\\([\\s\\d,]+\\))?((?!comment).)*(comment\\s*'(?<fieldComment>.*?)')?\\s*(,|$)"; String COL_PATTERN_STR = "\\s*(?<fieldName>\\S+)\\s+(?<fieldType>\\w+)\\s*(?:\\([\\s\\d,]+\\))?((?!comment).)*(comment\\s*'(?<fieldComment>.*?)')?\\s*(,|$)";
Pattern COL_PATTERN = Pattern.compile(COL_PATTERN_STR, Pattern.CASE_INSENSITIVE); Pattern COL_PATTERN = Pattern.compile(COL_PATTERN_STR, Pattern.CASE_INSENSITIVE);
Matcher matcher = DDL_PATTERN.matcher(paramInfo.getTableSql().trim()); Matcher matcher = DDL_PATTERN.matcher(paramInfo.getTableSql().trim());
if (matcher.find()){ if (matcher.find()) {
String tableName = matcher.group("tableName"); String tableName = matcher.group("tableName");
String tableComment = matcher.group("tableComment"); String tableComment = matcher.group("tableComment");
codeJavaInfo.setTableName(tableName.replaceAll("'","")); codeJavaInfo.setTableName(tableName.replaceAll("'", ""));
codeJavaInfo.setClassName(tableName.replaceAll("'","")); codeJavaInfo.setClassName(tableName.replaceAll("'", ""));
codeJavaInfo.setClassComment(tableComment.replaceAll("'","")); codeJavaInfo.setClassComment(tableComment.replaceAll("'", ""));
String columnsSQL = matcher.group("columnsSQL"); String columnsSQL = matcher.group("columnsSQL");
if (columnsSQL != null && columnsSQL.length() > 0){ if (columnsSQL != null && columnsSQL.length() > 0) {
Matcher colMatcher = COL_PATTERN.matcher(columnsSQL); Matcher colMatcher = COL_PATTERN.matcher(columnsSQL);
while (colMatcher.find()){ while (colMatcher.find()) {
String fieldName = colMatcher.group("fieldName"); String fieldName = colMatcher.group("fieldName");
String fieldType = colMatcher.group("fieldType"); String fieldType = colMatcher.group("fieldType");
String fieldComment = colMatcher.group("fieldComment"); String fieldComment = colMatcher.group("fieldComment");
if (!"key".equalsIgnoreCase(fieldType)){ if (!"key".equalsIgnoreCase(fieldType)) {
FieldInfo fieldInfo = new FieldInfo(); FieldInfo fieldInfo = new FieldInfo();
fieldInfo.setFieldName(fieldName.replaceAll("'","")); fieldInfo.setFieldName(fieldName.replaceAll("'", ""));
fieldInfo.setColumnName(fieldName.replaceAll("'","")); fieldInfo.setColumnName(fieldName.replaceAll("'", ""));
fieldInfo.setFieldClass(fieldType.replaceAll("'","")); fieldInfo.setFieldClass(fieldType.replaceAll("'", ""));
fieldInfo.setFieldComment(fieldComment.replaceAll("'","")); fieldInfo.setFieldComment(fieldComment.replaceAll("'", ""));
fieldList.add(fieldInfo); fieldList.add(fieldInfo);
} }
} }
@ -377,37 +384,38 @@ public class TableParseUtil {
} }
return codeJavaInfo; return codeJavaInfo;
} }
public static List<FieldInfo> processJsonObjectToFieldList(JSONObject jsonObject){
public static List<FieldInfo> processJsonObjectToFieldList(JSONObject jsonObject) {
// field List // field List
List<FieldInfo> fieldList = new ArrayList<FieldInfo>(); List<FieldInfo> fieldList = new ArrayList<FieldInfo>();
jsonObject.keySet().stream().forEach(jsonField->{ jsonObject.keySet().stream().forEach(jsonField -> {
FieldInfo fieldInfo = new FieldInfo(); FieldInfo fieldInfo = new FieldInfo();
fieldInfo.setFieldName(jsonField); fieldInfo.setFieldName(jsonField);
fieldInfo.setColumnName(jsonField); fieldInfo.setColumnName(jsonField);
fieldInfo.setFieldClass(String.class.getSimpleName()); fieldInfo.setFieldClass(String.class.getSimpleName());
fieldInfo.setFieldComment("father:"+jsonField); fieldInfo.setFieldComment("father:" + jsonField);
fieldList.add(fieldInfo); fieldList.add(fieldInfo);
if(jsonObject.get(jsonField) instanceof JSONArray){ if (jsonObject.get(jsonField) instanceof JSONArray) {
jsonObject.getJSONArray(jsonField).stream().forEach(arrayObject->{ jsonObject.getJSONArray(jsonField).stream().forEach(arrayObject -> {
FieldInfo fieldInfo2 = new FieldInfo(); FieldInfo fieldInfo2 = new FieldInfo();
fieldInfo2.setFieldName(arrayObject.toString()); fieldInfo2.setFieldName(arrayObject.toString());
fieldInfo2.setColumnName(arrayObject.toString()); fieldInfo2.setColumnName(arrayObject.toString());
fieldInfo2.setFieldClass(String.class.getSimpleName()); fieldInfo2.setFieldClass(String.class.getSimpleName());
fieldInfo2.setFieldComment("children:"+arrayObject.toString()); fieldInfo2.setFieldComment("children:" + arrayObject.toString());
fieldList.add(fieldInfo2); fieldList.add(fieldInfo2);
}); });
}else if(jsonObject.get(jsonField) instanceof JSONObject){ } else if (jsonObject.get(jsonField) instanceof JSONObject) {
jsonObject.getJSONObject(jsonField).keySet().stream().forEach(arrayObject->{ jsonObject.getJSONObject(jsonField).keySet().stream().forEach(arrayObject -> {
FieldInfo fieldInfo2 = new FieldInfo(); FieldInfo fieldInfo2 = new FieldInfo();
fieldInfo2.setFieldName(arrayObject.toString()); fieldInfo2.setFieldName(arrayObject.toString());
fieldInfo2.setColumnName(arrayObject.toString()); fieldInfo2.setColumnName(arrayObject.toString());
fieldInfo2.setFieldClass(String.class.getSimpleName()); fieldInfo2.setFieldClass(String.class.getSimpleName());
fieldInfo2.setFieldComment("children:"+arrayObject.toString()); fieldInfo2.setFieldComment("children:" + arrayObject.toString());
fieldList.add(fieldInfo2); fieldList.add(fieldInfo2);
}); });
} }
}); });
if(fieldList.size()<1){ if (fieldList.size() < 1) {
throw new CodeGenerateException("JSON解析失败"); throw new CodeGenerateException("JSON解析失败");
} }
return fieldList; return fieldList;
@ -421,11 +429,11 @@ public class TableParseUtil {
//get origin sql //get origin sql
String fieldSqlStr = paramInfo.getTableSql().toLowerCase().trim(); String fieldSqlStr = paramInfo.getTableSql().toLowerCase().trim();
fieldSqlStr=fieldSqlStr.replaceAll(" "," ").replaceAll("\\\\n`","") fieldSqlStr = fieldSqlStr.replaceAll(" ", " ").replaceAll("\\\\n`", "")
.replaceAll("\\+","").replaceAll("``","`").replaceAll("\\\\",""); .replaceAll("\\+", "").replaceAll("``", "`").replaceAll("\\\\", "");
String valueStr = fieldSqlStr.substring(fieldSqlStr.lastIndexOf("values")+6).replaceAll(" ","").replaceAll("\\(","").replaceAll("\\)",""); String valueStr = fieldSqlStr.substring(fieldSqlStr.lastIndexOf("values") + 6).replaceAll(" ", "").replaceAll("\\(", "").replaceAll("\\)", "");
//get the string between insert into and values //get the string between insert into and values
fieldSqlStr=fieldSqlStr.substring(0,fieldSqlStr.lastIndexOf("values")); fieldSqlStr = fieldSqlStr.substring(0, fieldSqlStr.lastIndexOf("values"));
System.out.println(fieldSqlStr); System.out.println(fieldSqlStr);
@ -433,7 +441,7 @@ public class TableParseUtil {
//String DDL_PATTEN_STR="\\s*create\\s+table\\s+(?<tableName>\\S+)[^\\(]*\\((?<columnsSQL>[\\s\\S]+)\\)[^\\)]+?(comment\\s*(=|on\\s+table)\\s*'(?<tableComment>.*?)'\\s*;?)?$"; //String DDL_PATTEN_STR="\\s*create\\s+table\\s+(?<tableName>\\S+)[^\\(]*\\((?<columnsSQL>[\\s\\S]+)\\)[^\\)]+?(comment\\s*(=|on\\s+table)\\s*'(?<tableComment>.*?)'\\s*;?)?$";
Matcher matcher1 = Pattern.compile(insertSqlPattenStr).matcher(fieldSqlStr); Matcher matcher1 = Pattern.compile(insertSqlPattenStr).matcher(fieldSqlStr);
while(matcher1.find()){ while (matcher1.find()) {
String tableName = matcher1.group("tableName"); String tableName = matcher1.group("tableName");
//System.out.println("tableName:"+tableName); //System.out.println("tableName:"+tableName);
@ -445,28 +453,29 @@ public class TableParseUtil {
List<String> valueList = new ArrayList<>(); List<String> valueList = new ArrayList<>();
//add values as comment //add values as comment
Arrays.stream(valueStr.split(",")).forEach(column->{ Arrays.stream(valueStr.split(",")).forEach(column -> {
valueList.add(column); valueList.add(column);
}); });
AtomicInteger n= new AtomicInteger(0); AtomicInteger n = new AtomicInteger(0);
//add column to fleldList //add column to fleldList
Arrays.stream(columnsSQL.replaceAll(" ", "").split(",")).forEach(column->{ Arrays.stream(columnsSQL.replaceAll(" ", "").split(",")).forEach(column -> {
FieldInfo fieldInfo2 = new FieldInfo(); FieldInfo fieldInfo2 = new FieldInfo();
fieldInfo2.setFieldName(column); fieldInfo2.setFieldName(column);
fieldInfo2.setColumnName(column); fieldInfo2.setColumnName(column);
fieldInfo2.setFieldClass(String.class.getSimpleName()); fieldInfo2.setFieldClass(String.class.getSimpleName());
if(n.get()<valueList.size()){ if (n.get() < valueList.size()) {
fieldInfo2.setFieldComment(column+" , eg."+valueList.get(n.get())); fieldInfo2.setFieldComment(column + " , eg." + valueList.get(n.get()));
} }
fieldList.add(fieldInfo2); fieldList.add(fieldInfo2);
n.getAndIncrement(); n.getAndIncrement();
}); });
} }
if(fieldList.size()<1){ if (fieldList.size() < 1) {
throw new CodeGenerateException("INSERT SQL解析失败"); throw new CodeGenerateException("INSERT SQL解析失败");
} }
codeJavaInfo.setFieldList(fieldList); codeJavaInfo.setFieldList(fieldList);
return codeJavaInfo; return codeJavaInfo;
} }
} }

2
generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl
View File

@ -14,7 +14,7 @@ import java.util.Map;
* @date ${.now?string('yyyy-MM-dd')} * @date ${.now?string('yyyy-MM-dd')}
*/ */
@RestController @RestController
@RequestMapping(value = "/${classInfo.className}") @RequestMapping(value = "/${classInfo.className?uncap_first}")
public class ${classInfo.className}Controller { public class ${classInfo.className}Controller {
@Resource @Resource