From 6d54367c7fa21c12c6fbdc20c8bb739537d9e545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moshow=E9=83=91=E9=94=B4?= Date: Sun, 16 Mar 2025 15:19:12 +0800 Subject: [PATCH] =?UTF-8?q?|=202025.03.16=20|=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=94=B1=E4=BA=8ESQL=E7=B1=BB=E5=9E=8B=E5=A4=A7=E5=86=99?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E8=BD=AC=E6=8D=A2=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=EF=BC=88=E6=84=9F=E8=B0=A2@zzy-desi?= =?UTF-8?q?gn=E7=9A=84=E5=8F=8D=E9=A6=88=EF=BC=89
=20JPA=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=EF=BC=9A=E4=BF=AE=E5=A4=8D=E4=B8=8D=E5=BC=80=E5=90=AF?= =?UTF-8?q?Lombok=E6=83=85=E5=86=B5=E4=B8=8BSet/Get=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98;=E4=BF=AE=E5=A4=8DimportDd?= =?UTF-8?q?ate=E5=88=A4=E6=96=AD=E4=B8=BAtrue=E5=90=8E=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=BC=95=E5=85=A5=E6=97=A5=E6=9C=9F=E7=B1=BB=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=88=E6=84=9F=E8=B0=A2@PenroseYang=E7=9A=84?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 ++++- .../system/generator/service/GeneratorServiceImpl.java | 3 ++- .../templates/code-generator/jpa-starp/starp-repository.ftl | 1 + .../main/resources/templates/code-generator/jpa/entity.ftl | 6 +++++- .../resources/templates/code-generator/jpa/repository.ftl | 5 ++--- .../templates/code-generator/tk-mybatis/tk-mapper.ftl | 1 + 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 36768b1..3f57fe6 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,7 @@ - 可在`applicaltion.yml`中的`OEM.mode`设置`js/css引入模式`为`local`(本地模式，默认)/`CDN`(云CDN模式，在线网站推荐，省流量) - OEM信息可以在`applicaltion.yml`中的`OEM`中更改 - *支持公共js/css的Local/CDN模式切换，方便`本地`或者`工具站`进行部署，可以在`application.yml`的`OEM.Mode=`进行设置，之后请在`header-CDN-v2.html`/`header-local-v2.html`中检查对应js/css配置是否正确。默认为`CDN`模式。对于没有网络的环境请使用`local`模式。 +- 如何判断是否包含Date日期类并引入，搜索`<#assign importDdate = true />`即可找到对应的方法判断和引入 # Branch Detail 分支介绍 - Master：主力分支，基于SpringBoot3+，需要JDK17+ @@ -68,11 +69,13 @@ - NewUI：新UI界面改版尝鲜 # 更新预告 -1.计划引入DJANGO等其他语言的ORM模板，欢迎大家submit相关代码供参考 +1.计划优化一下前端界面，改善由于静态资源加载问题导致的访问缓慢问题，目前正在开发中 +2.根据大家Raised的Issue优化一下模板 # Update Logs | 更新日期 | 更新内容 | |:-----------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| 2025.03.16 | 修复由于SQL类型大写导致无法转换的问题。（感谢@zzy-design的反馈）
JPA模板：修复不开启Lombok情况下Set/Get方法生成问题;修复importDdate判断为true后没有引入日期类的问题（感谢@PenroseYang的反馈） | | 2024.12.29 | 优化前端加载速度，优化输出代码着色，CDN改字节跳动静态资源公共库。
| | 2024.12.23 | 新增InsertSQL模式，采用JSQLParser引擎进行封装
优化代码封装
CDN恢复为staticfile.org加速(如果本地卡的话，建议切换local模式)。
| | 2024.04.23 | 切换为更快更稳定的BootCDN进行加速。
前端NEWUI改版（基于AdminLTE+Bootstrap+Vue+ElementUI混合模式）。 | diff --git a/generator-web/src/main/java/com/softdev/system/generator/service/GeneratorServiceImpl.java b/generator-web/src/main/java/com/softdev/system/generator/service/GeneratorServiceImpl.java index 54c30c3..b5b9194 100644 --- a/generator-web/src/main/java/com/softdev/system/generator/service/GeneratorServiceImpl.java +++ b/generator-web/src/main/java/com/softdev/system/generator/service/GeneratorServiceImpl.java @@ -308,7 +308,8 @@ public class GeneratorServiceImpl implements GeneratorService { fieldName = columnName; } columnLine = columnLine.substring(columnLine.indexOf("`") + 1).trim(); - String mysqlType = columnLine.split("\\s+")[1]; + //2025-03-16 修复由于类型大写导致无法转换的问题 + String mysqlType = columnLine.split("\\s+")[1].toLowerCase(Locale.ROOT); if(mysqlType.contains("(")){ mysqlType = mysqlType.substring(0, mysqlType.indexOf("(")); } diff --git a/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-repository.ftl b/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-repository.ftl index c3643a2..978a9d7 100644 --- a/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-repository.ftl +++ b/generator-web/src/main/resources/templates/code-generator/jpa-starp/starp-repository.ftl @@ -8,6 +8,7 @@ +<#if importDdate?exists && importDdate==true>import java.util.Date; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/generator-web/src/main/resources/templates/code-generator/jpa/entity.ftl b/generator-web/src/main/resources/templates/code-generator/jpa/entity.ftl index fb75e37..3259d40 100644 --- a/generator-web/src/main/resources/templates/code-generator/jpa/entity.ftl +++ b/generator-web/src/main/resources/templates/code-generator/jpa/entity.ftl @@ -40,8 +40,10 @@ public class ${classInfo.className} implements Serializable { public ${classInfo.className}() { } - + +<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0> +<#list classInfo.fieldList as fieldItem > <#if isLombok?exists && isLombok==false> public ${fieldItem.fieldClass} get${fieldItem.fieldName?cap_first}() { return ${fieldItem.fieldName}; @@ -51,4 +53,6 @@ public class ${classInfo.className} implements Serializable { this.${fieldItem.fieldName} = ${fieldItem.fieldName}; } + } + \ No newline at end of file diff --git a/generator-web/src/main/resources/templates/code-generator/jpa/repository.ftl b/generator-web/src/main/resources/templates/code-generator/jpa/repository.ftl index c3643a2..899b409 100644 --- a/generator-web/src/main/resources/templates/code-generator/jpa/repository.ftl +++ b/generator-web/src/main/resources/templates/code-generator/jpa/repository.ftl @@ -8,6 +8,7 @@ +<#if importDdate?exists && importDdate==true>import java.util.Date; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -21,6 +22,4 @@ import org.springframework.stereotype.Repository; @Repository public interface ${classInfo.className}Repository extends JpaRepository<${classInfo.className},Integer> { - - -} +} \ No newline at end of file diff --git a/generator-web/src/main/resources/templates/code-generator/tk-mybatis/tk-mapper.ftl b/generator-web/src/main/resources/templates/code-generator/tk-mybatis/tk-mapper.ftl index da6d61d..5fa5986 100644 --- a/generator-web/src/main/resources/templates/code-generator/tk-mybatis/tk-mapper.ftl +++ b/generator-web/src/main/resources/templates/code-generator/tk-mybatis/tk-mapper.ftl @@ -8,6 +8,7 @@ +<#if importDdate?exists && importDdate==true>import java.util.Date; import java.util.List; import io.mybatis.mapper.Mapper;