调整代码生成器生成变量命名方式

This commit is contained in:
yubaolee 2025-02-24 12:18:45 +08:00
parent 329c2c9f07
commit 5eec669cde
2 changed files with 129 additions and 122 deletions

View File

@ -4,6 +4,7 @@ using System.ComponentModel;
using System.Data; using System.Data;
using System.Linq; using System.Linq;
using Autofac.Extensions.DependencyInjection; using Autofac.Extensions.DependencyInjection;
using Humanizer;
using Infrastructure; using Infrastructure;
using Infrastructure.Utilities; using Infrastructure.Utilities;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
@ -135,6 +136,7 @@ namespace OpenAuth.App
/// </summary> /// </summary>
private IList<SysTableColumn> GetOracleStructure(string tableName) private IList<SysTableColumn> GetOracleStructure(string tableName)
{ {
tableName = tableName.ToUpper();
var sql = $@" var sql = $@"
select utc.column_name as columnname select utc.column_name as columnname
, utc.data_type columntype , utc.data_type columntype
@ -171,7 +173,7 @@ select utc.column_name as columnname
('CHAR', 'VARCHAR', 'TINY TEXT', 'TEXT', 'MEDIUMTEXT', 'LONGTEXT', 'TINYBLOB', 'BLOB', ('CHAR', 'VARCHAR', 'TINY TEXT', 'TEXT', 'MEDIUMTEXT', 'LONGTEXT', 'TINYBLOB', 'BLOB',
'MEDIUMBLOB', 'LONGBLOB', 'Time') then 'MEDIUMBLOB', 'LONGBLOB', 'Time') then
'string' 'string'
when data_type in ('Date', 'DateTime', 'TIMESTAMP(6)') then when data_type in ('DATE', 'DATETIME', 'TIMESTAMP(6)') then
'DateTime' 'DateTime'
else 'string' else 'string'
end as entitytype end as entitytype
@ -188,6 +190,7 @@ order by column_id; ";
var columnList = columns?.ToList(); var columnList = columns?.ToList();
if (columnList != null && columnList.Any()) if (columnList != null && columnList.Any())
{ {
columnList.ForEach(u => u.ColumnName = u.ColumnName.Transform(To.LowerCase, To.TitleCase));
return columnList; return columnList;
} }
} }
@ -253,6 +256,7 @@ order by column_id; ";
var columnList = columns?.ToList(); var columnList = columns?.ToList();
if (columnList != null && columnList.Any()) if (columnList != null && columnList.Any())
{ {
columnList.ForEach(u => u.ColumnName = u.ColumnName.Transform(To.LowerCase, To.TitleCase));
return columnList; return columnList;
} }
} }
@ -263,10 +267,11 @@ order by column_id; ";
/// <summary> /// <summary>
/// 获取Mysql表结构信息 /// 获取pgsql表结构信息
/// </summary> /// </summary>
private IList<SysTableColumn> GetPostgreStructure(string tableName) private IList<SysTableColumn> GetPostgreStructure(string tableName)
{ {
tableName = tableName.ToLower();
var sql = $@"select attr.attrelid var sql = $@"select attr.attrelid
, schema.nspname as schemaname , schema.nspname as schemaname
, class.relname as tablename -- , class.relname as tablename --
@ -328,6 +333,7 @@ where attr.attnum > 0
var columnList = columns?.ToList(); var columnList = columns?.ToList();
if (columnList != null && columnList.Any()) if (columnList != null && columnList.Any())
{ {
columnList.ForEach(u => u.ColumnName = u.ColumnName.Transform(To.LowerCase, To.TitleCase));
return columnList; return columnList;
} }
} }

View File

@ -19,6 +19,7 @@
<PackageReference Include="Autofac" Version="8.1.1" /> <PackageReference Include="Autofac" Version="8.1.1" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="Autofac.Extras.Quartz" Version="5.1.0" /> <PackageReference Include="Autofac.Extras.Quartz" Version="5.1.0" />
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.2" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.2" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />