From 6fb2cbae63470ef3f4fd14e5d8463db840294477 Mon Sep 17 00:00:00 2001 From: "moshowgame@126.com" Date: Sat, 5 Jan 2019 23:40:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=84=E7=90=86number/deci?= =?UTF-8?q?mal(x,x)=E7=B1=BB=E5=9E=8B=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=88?= =?UTF-8?q?=E6=84=9F=E8=B0=A2@arthaschan=E7=9A=84=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=EF=BC=89=EF=BC=8C=E4=BF=AE=E5=A4=8DJdbcTemplates=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E4=B8=A4=E5=A4=84=E9=94=99=E8=AF=AF=EF=BC=88=E6=84=9F?= =?UTF-8?q?=E8=B0=A2@everflourish=E7=9A=84=E5=8F=8D=E9=A6=88=EF=BC=89?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + .../system/generator/util/TableParseUtil.java | 13 ++++++++++--- .../templates/xxl-code-generator/jtdao.ftl | 2 +- .../templates/xxl-code-generator/jtdaoimpl.ftl | 3 +-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ca2123c..7e5575c 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ SpringBootCodeGenerator CSDN博客 http://blog.csdn.net/moshowgame 更新日期 更新内容 +20190106修复处理number/decimal(x,x)类型的逻辑（感谢@arthaschan的反馈），修复JdbcTemplates模板两处错误（感谢@everflourish的反馈）。 20181212首页UI优化，新增MybatisPlus模块（感谢@三叔同事的建议），修复作者名和包名获取失败问题（感谢@Yanch1994的反馈）。 20181122优化正则表达式点号的处理，优化处理字段类型，对number类型增加int，long，BigDecimal的区分判断（感谢@lshz0088的指导）。 20181108修复非字段描述"KEY FK_xxxx (xxxx)"导致生成KEY字段情况（感谢@tornadoorz反馈）。 diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java index a5bba50..4eba246 100644 --- a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java +++ b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java @@ -1,7 +1,6 @@ package com.softdev.system.generator.util; - import com.softdev.system.generator.entity.ClassInfo; import com.softdev.system.generator.entity.FieldInfo; @@ -185,9 +184,17 @@ public class TableParseUtil { if(startKh>=0){ int endKh=columnLine.indexOf(")",startKh); String[] fanwei=columnLine.substring(startKh+1,endKh).split("，"); - if("0".equals(fanwei[1])){ - //如果没有小数位数 + //2019-1-5 zhengk 修复@arthaschan反馈的超出范围错误 + //System.out.println("fanwei"+ JSON.toJSONString(fanwei)); + // //number(20,6) fanwei["20","6"] + // //number(0,6) fanwei["0","6"] + // //number(20,0) fanwei["20","0"] + // //number(20) fanwei["20"] + //如果括号里是1位或者2位且第二位为0，则进行特殊处理。只有有小数位，都设置为BigDecimal。 + if((fanwei.length>1&&"0".equals(fanwei[1]))||fanwei.length==1){ int length=Integer.valueOf(fanwei[0]); + if(fanwei.length>1) length=Integer.valueOf(fanwei[1]); + //数字范围9位及一下用Integer，大的用Long if(length<=9){ fieldClass = Integer.class.getSimpleName(); }else{ diff --git a/generator-web/src/main/resources/templates/xxl-code-generator/jtdao.ftl b/generator-web/src/main/resources/templates/xxl-code-generator/jtdao.ftl index 30b65f2..466aa7c 100644 --- a/generator-web/src/main/resources/templates/xxl-code-generator/jtdao.ftl +++ b/generator-web/src/main/resources/templates/xxl-code-generator/jtdao.ftl @@ -5,7 +5,7 @@ import java.util.List; * ${classInfo.classComment} * @author ${authorName} ${.now?string('yyyy-MM-dd')} */ -public interface IAccountDAO { +public interface I${classInfo.className}DAO { int add(${classInfo.classComment} ${classInfo.className?uncap_first}); diff --git a/generator-web/src/main/resources/templates/xxl-code-generator/jtdaoimpl.ftl b/generator-web/src/main/resources/templates/xxl-code-generator/jtdaoimpl.ftl index fa7833d..1a0d02d 100644 --- a/generator-web/src/main/resources/templates/xxl-code-generator/jtdaoimpl.ftl +++ b/generator-web/src/main/resources/templates/xxl-code-generator/jtdaoimpl.ftl @@ -28,8 +28,7 @@ public class ${classInfo.className}DaoImpl implements I${classInfo.className}Dao <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0> <#list classInfo.fieldList as fieldItem ><#if fieldItem_index gt 0 >${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}(), <#list classInfo.fieldList as fieldItem ><#if fieldItem_index = 0 >${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}() - - + ; } @Override