diff --git a/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/CURD/SqlMap-IsExist.cshtml b/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/CURD/SqlMap-IsExist.cshtml index d0ba8ad..a877ec6 100644 --- a/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/CURD/SqlMap-IsExist.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/CURD/SqlMap-IsExist.cshtml @@ -9,5 +9,4 @@ Select Count(1) From @table.Name T - - + \ No newline at end of file diff --git a/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/CURD/SqlMap-QueryByPage.cshtml b/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/CURD/SqlMap-QueryByPage.cshtml index 1b94db4..8ea99f6 100644 --- a/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/CURD/SqlMap-QueryByPage.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/CURD/SqlMap-QueryByPage.cshtml @@ -21,8 +21,8 @@ - Select - + Select + From @table.Name As T @@ -30,5 +30,5 @@ T.@pkCol.Name Desc - Limit @(dbPrefix)PageSize Offset @(dbPrefix)Offset + Limit @(dbPrefix)PageSize Offset @(dbPrefix)Offset \ No newline at end of file diff --git a/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-MySql.cshtml b/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-MySql.cshtml index 631667d..4f45572 100644 --- a/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-MySql.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-MySql.cshtml @@ -24,35 +24,12 @@ @Include("SqlMap-ResultMaps.cshtml", Model) @Include("SqlMap-Columns.cshtml", Model) - - - - @foreach (var col in table.Columns) - { - - T.@col.Name = @dbPrefix@col.ConvertedName - - } - - + @Include("SqlMap-WhereQueryParams.cshtml", Model) @Include("./CURD/SqlMap-Insert.cshtml", Model) @Include("./CURD/SqlMap-Delete.cshtml", Model) @Include("./CURD/SqlMap-Update.cshtml", Model) @Include("./CURD/SqlMap-Query.cshtml", Model) - - - - Select - - From @table.Name As T - - - - T.@pkCol.Name Desc - - - Limit @(dbPrefix)Offset,@(dbPrefix)PageSize - + @Include("./CURD/SqlMap-QueryByPage.cshtml", Model) @Include("./CURD/SqlMap-GetRecord.cshtml", Model) @Include("./CURD/SqlMap-GetEntity.cshtml", Model) @Include("./CURD/SqlMap-IsExist.cshtml", Model) diff --git a/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-Oracle.cshtml b/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-Oracle.cshtml index 67fd9e9..ac8fa90 100644 --- a/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-Oracle.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-Oracle.cshtml @@ -24,17 +24,7 @@ @Include("SqlMap-ResultMaps.cshtml", Model) @Include("SqlMap-Columns.cshtml", Model) - - - - @foreach (var col in table.Columns) - { - - T.@col.Name = @dbPrefix@col.ConvertedName - - } - - + @Include("SqlMap-WhereQueryParams.cshtml", Model) @Include("./CURD/SqlMap-Insert.cshtml", Model) @Include("./CURD/SqlMap-Delete.cshtml", Model) @Include("./CURD/SqlMap-Update.cshtml", Model) diff --git a/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-PostgreSql.cshtml b/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-PostgreSql.cshtml index 104d503..10560f8 100644 --- a/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-PostgreSql.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-PostgreSql.cshtml @@ -25,35 +25,12 @@ @Include("SqlMap-ResultMaps.cshtml", Model) @Include("SqlMap-Columns.cshtml", Model) - - - - @foreach (var col in table.Columns) - { - - T.@col.Name = @dbPrefix@col.ConvertedName - - } - - + @Include("SqlMap-WhereQueryParams.cshtml", Model) @Include("./CURD/SqlMap-Insert.cshtml", Model) @Include("./CURD/SqlMap-Delete.cshtml", Model) @Include("./CURD/SqlMap-Update.cshtml", Model) @Include("./CURD/SqlMap-Query.cshtml", Model) - - - - Select - - From @table.Name As T - - - - T.@pkCol.Name Desc - - - Limit @(dbPrefix)PageSize Offset @(dbPrefix)Offset - + @Include("./CURD/SqlMap-QueryByPage.cshtml", Model) @Include("./CURD/SqlMap-GetRecord.cshtml", Model) @Include("./CURD/SqlMap-GetEntity.cshtml", Model) @Include("./CURD/SqlMap-IsExist.cshtml", Model) diff --git a/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-SQLite.cshtml b/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-SQLite.cshtml index dc4e2c6..4f45572 100644 --- a/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-SQLite.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-SQLite.cshtml @@ -24,35 +24,12 @@ @Include("SqlMap-ResultMaps.cshtml", Model) @Include("SqlMap-Columns.cshtml", Model) - - - - @foreach (var col in table.Columns) - { - - T.@col.Name = @dbPrefix@col.ConvertedName - - } - - + @Include("SqlMap-WhereQueryParams.cshtml", Model) @Include("./CURD/SqlMap-Insert.cshtml", Model) @Include("./CURD/SqlMap-Delete.cshtml", Model) @Include("./CURD/SqlMap-Update.cshtml", Model) @Include("./CURD/SqlMap-Query.cshtml", Model) - - - - Select - - From @table.Name As T - - - - T.@pkCol.Name Desc - - - Limit @(dbPrefix)PageSize Offset @(dbPrefix)Offset - + @Include("./CURD/SqlMap-QueryByPage.cshtml", Model) @Include("./CURD/SqlMap-GetRecord.cshtml", Model) @Include("./CURD/SqlMap-GetEntity.cshtml", Model) @Include("./CURD/SqlMap-IsExist.cshtml", Model) diff --git a/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-SqlServer.cshtml b/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-SqlServer.cshtml index 4ae04f2..e04ec43 100644 --- a/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-SqlServer.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-SqlServer.cshtml @@ -34,17 +34,7 @@ @Include("SqlMap-ResultMaps.cshtml", Model) @Include("SqlMap-Columns.cshtml", Model) - - - - @foreach (var col in table.Columns) - { - - T.@col.Name = @dbPrefix@col.ConvertedName - - } - - + @Include("SqlMap-WhereQueryParams.cshtml", Model) @Include("./CURD/SqlMap-Insert.cshtml", Model) @Include("./CURD/SqlMap-Delete.cshtml", Model) @Include("./CURD/SqlMap-Update.cshtml", Model) diff --git a/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-WhereQueryParams.cshtml b/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-WhereQueryParams.cshtml new file mode 100644 index 0000000..6fe64aa --- /dev/null +++ b/src/SmartCode.Generator/RazorTemplates/CSharp/SqlMap-Partials/SqlMap-WhereQueryParams.cshtml @@ -0,0 +1,19 @@ +@using SmartCode +@using SmartCode.Db +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate +@{ + var dbSource = Model.GetDataSource(); + var table = Model.GetCurrentTable(); + var dbPrefix = dbSource.DbProvider.ParameterPrefix; +} + + + + @foreach (var col in table.Columns) + { + + T.@col.Name = @dbPrefix@col.ConvertedName + + } + + \ No newline at end of file diff --git a/src/SmartCode.Generator/RazorTemplates/ETL/ToMysqlTable.cshtml b/src/SmartCode.Generator/RazorTemplates/ETL/ToMysqlTable.cshtml index 4f6606d..395990a 100644 --- a/src/SmartCode.Generator/RazorTemplates/ETL/ToMysqlTable.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/ETL/ToMysqlTable.cshtml @@ -1,6 +1,9 @@ -@using SmartCode +@using System +@using System.Collections.Generic +@using System.Linq +@using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; var dbSource = Model.GetDataSource(); @@ -63,7 +66,7 @@ DataSource: AutoIncrement: @(PKColumn.AutoIncrement ? "true" : "false") @if (!String.IsNullOrEmpty(modifyTime)) { - @Html.PadLeft(4)ModifyTime: @modifyTime + @PadLeft(4)ModifyTime: @modifyTime } @@ -113,6 +116,6 @@ Build: {Column: @col.Name,Mapping: @col.ConvertedName} if (colIndex < table.Columns.Count() - 1) {@(",")} - @Html.NewLine() + @NewLine() } ] diff --git a/src/SmartCode.Generator/RazorTemplates/ETL/ToPGBuild.cshtml b/src/SmartCode.Generator/RazorTemplates/ETL/ToPGBuild.cshtml index 9cbf35f..8b6225e 100644 --- a/src/SmartCode.Generator/RazorTemplates/ETL/ToPGBuild.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/ETL/ToPGBuild.cshtml @@ -1,6 +1,9 @@ -@using SmartCode +@using System +@using System.Collections.Generic +@using System.Linq +@using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; var dbSource = Model.GetDataSource(); @@ -59,7 +62,7 @@ DataSource: AutoIncrement: @(PKColumn.AutoIncrement ? "true" : "false") @if (!String.IsNullOrEmpty(modifyTime)) { - @Html.PadLeft(4)ModifyTime: @modifyTime + @PadLeft(4)ModifyTime: @modifyTime } @@ -107,6 +110,6 @@ Build: {Column: @col.Name,Mapping: @col.ConvertedName} if (colIndex < table.Columns.Count() - 1) {@(",")} - @Html.NewLine() + @NewLine() } ] diff --git a/src/SmartCode.Generator/RazorTemplates/Java/AbstractEntity.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/AbstractEntity.cshtml index 58d289e..5cc2c9e 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/AbstractEntity.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/AbstractEntity.cshtml @@ -1,10 +1,9 @@ @using SmartCode -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ - Layout = "_JavaLayout.cshtml"; var project = Model.Project; } - +@Include("Copyright.cshtml", Model) package @(project.Module).entity; diff --git a/src/SmartCode.Generator/RazorTemplates/Java/AppConfig.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/AppConfig.cshtml index 6fa690f..0f26f56 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/AppConfig.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/AppConfig.cshtml @@ -1,11 +1,10 @@ @using SmartCode -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ - Layout = "_JavaLayout.cshtml"; var project = Model.Project; var buildTask = Model.Build; } - +@Include("Copyright.cshtml", Model) package @(project.Module).server.config; diff --git a/src/SmartCode.Generator/RazorTemplates/Java/Application.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/Application.cshtml index 3a8a599..11f9a0a 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/Application.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/Application.cshtml @@ -1,7 +1,6 @@ @using SmartCode -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ - Layout = "_JavaLayout.cshtml"; var project = Model.Project; var appName = "Demo"; @@ -12,6 +11,7 @@ } var appClassName = $"{appName}Application"; } +@Include("Copyright.cshtml", Model) package @(project.Module).server; diff --git a/src/SmartCode.Generator/RazorTemplates/Java/Controller.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/Controller.cshtml index 79f54a0..948b084 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/Controller.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/Controller.cshtml @@ -1,7 +1,7 @@ +@using System @using SmartCode -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ - Layout = "_JavaLayout.cshtml"; var project = Model.Project; var buildTask = Model.Build; var table = Model.GetCurrentTable(); @@ -22,6 +22,7 @@ throw new ArgumentException("can not find Project -> BuildTasks -> Service ."); } } +@Include("Copyright.cshtml", Model) package @(project.Module).@buildTask.Module; @@ -33,7 +34,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import @(project.Module).@(serviceBuild.Module).@serviceName; -@Html.NewLine() +@NewLine() @@RestController @@RequestMapping("@entityCamelName") public class @controllerName { diff --git a/src/SmartCode.Generator/RazorTemplates/Java/Copyright.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/Copyright.cshtml index f43b08a..38f1299 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/Copyright.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/Copyright.cshtml @@ -1,11 +1,12 @@ -@using SmartCode -@model BuildContext +@using System +@using SmartCode +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; } /******************************* -* @@author @project.Author -* @@date @DateTime.Now.ToString("yyyy-MM-dd HH:mm") -* Code Generate By SmartCode -* Code Generate Github : https://github.com/Ahoo-Wang/SmartCode -*******************************/ \ No newline at end of file + * @@author @project.Author + * @@date @DateTime.Now.ToString("yyyy-MM-dd HH:mm") + * Code Generate By SmartCode + * Code Generate Github : https://github.com/Ahoo-Wang/SmartCode + *******************************/ \ No newline at end of file diff --git a/src/SmartCode.Generator/RazorTemplates/Java/Entity.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/Entity.cshtml index 93945c0..f02fd07 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/Entity.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/Entity.cshtml @@ -1,8 +1,9 @@ -@using SmartCode +@using System +@using System.Collections.Generic +@using SmartCode @using SmartCode.Generator.Extensions -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ - Layout = "_JavaLayout.cshtml"; var project = Model.Project; var buildTask = Model.Build; var table = Model.GetCurrentTable(); @@ -57,7 +58,7 @@ } } - +@Include("Copyright.cshtml", Model) package @(project.Module).@buildTask.Module; diff --git a/src/SmartCode.Generator/RazorTemplates/Java/GenericRepository.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/GenericRepository.cshtml index 609f174..64b9576 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/GenericRepository.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/GenericRepository.cshtml @@ -1,9 +1,8 @@ @using SmartCode @using SmartCode.Db; @using SmartCode.Generator.Extensions -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ - Layout = "_JavaLayout.cshtml"; var project = Model.Project; var buildTask = Model.Build; var table = Model.GetCurrentTable(); @@ -17,4 +16,5 @@ var dbSource = Model.GetDataSource(); } +@Include("Copyright.cshtml", Model) diff --git a/src/SmartCode.Generator/RazorTemplates/Java/Pom-Api.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/Pom-Api.cshtml index 9f08672..ff594e9 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/Pom-Api.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/Pom-Api.cshtml @@ -1,8 +1,7 @@ @using SmartCode -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ - Layout = null; var project = Model.Project; } diff --git a/src/SmartCode.Generator/RazorTemplates/Java/Pom-Parent.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/Pom-Parent.cshtml index f924ae6..95fb6b4 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/Pom-Parent.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/Pom-Parent.cshtml @@ -1,8 +1,7 @@ @using SmartCode -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ - Layout = null; var project = Model.Project; } diff --git a/src/SmartCode.Generator/RazorTemplates/Java/Pom-Server.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/Pom-Server.cshtml index 4d30c45..c98cc93 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/Pom-Server.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/Pom-Server.cshtml @@ -1,9 +1,8 @@ @using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ - Layout = null; var project = Model.Project; var dbSource = Model.GetDataSource(); } diff --git a/src/SmartCode.Generator/RazorTemplates/Java/Repository.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/Repository.cshtml index b937e8e..7d60673 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/Repository.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/Repository.cshtml @@ -1,8 +1,9 @@ +@using System +@using System.Collections.Generic @using SmartCode @using SmartCode.Db; -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ - Layout = "_JavaLayout.cshtml"; var project = Model.Project; var buildTask = Model.Build; var table = Model.GetCurrentTable(); @@ -44,6 +45,7 @@ } var genericParameterKey = $"{table.ConvertedName},{primaryKeyType}"; } +@Include("Copyright.cshtml", Model) package @(project.Module).@buildTask.Module; @@ -52,7 +54,7 @@ import org.springframework.stereotype.Repository; import @(genericRepositoryPackageName).GenericRepository; import @(project.Module).@(entityBuild.Module).@table.ConvertedName; -@Html.NewLine() +@NewLine() @@Repository @@Mapper public interface @(table.ConvertedName)Repository extends GenericRepository<@genericParameterKey> { diff --git a/src/SmartCode.Generator/RazorTemplates/Java/Resources/Application-YAML.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/Resources/Application-YAML.cshtml index 731e955..f2a41b9 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/Resources/Application-YAML.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/Resources/Application-YAML.cshtml @@ -1,9 +1,10 @@ +@using System @using System.Text @using MySql.Data.MySqlClient @using Npgsql @using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; var buildTask = Model.Build; diff --git a/src/SmartCode.Generator/RazorTemplates/Java/Service.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/Service.cshtml index 876562a..f683346 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/Service.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/Service.cshtml @@ -1,7 +1,7 @@ +@using System @using SmartCode -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ - Layout = "_JavaLayout.cshtml"; var project = Model.Project; var buildTask = Model.Build; var table = Model.GetCurrentTable(); @@ -22,8 +22,7 @@ throw new ArgumentException("can not find Project -> BuildTasks -> [Repository] ."); } } - - +@Include("Copyright.cshtml", Model) package @(project.Module).@buildTask.Module; @@ -37,7 +36,7 @@ import java.util.stream.Collectors; import @(project.Module).@(repositoryBuild.Module).@repositoryName; -@Html.NewLine() +@NewLine() @@Service public class @serviceName { @@Autowired diff --git a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-Delete.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-Delete.cshtml index 8d98c88..f69b45c 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-Delete.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-Delete.cshtml @@ -1,6 +1,6 @@ @using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; var dbSource = Model.GetDataSource(); diff --git a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-GetById.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-GetById.cshtml index c6fc4e4..588672f 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-GetById.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-GetById.cshtml @@ -1,6 +1,6 @@ @using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; var dbSource = Model.GetDataSource(); diff --git a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-GetEntity.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-GetEntity.cshtml index e0d96d7..4973757 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-GetEntity.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-GetEntity.cshtml @@ -1,6 +1,6 @@ @using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; var dbSource = Model.GetDataSource(); diff --git a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-GetTotal.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-GetTotal.cshtml index 103f780..62ecdd2 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-GetTotal.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-GetTotal.cshtml @@ -1,6 +1,6 @@ @using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; var dbSource = Model.GetDataSource(); diff --git a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-Insert.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-Insert.cshtml index 3519a47..d976057 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-Insert.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-Insert.cshtml @@ -1,6 +1,7 @@ -@using SmartCode +@using System.Linq +@using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; var dbSource = Model.GetDataSource(); @@ -20,10 +21,10 @@ @for (var colIndex = 0; colIndex < table.Columns.Count(); colIndex++) { var col = table.Columns.ElementAt(colIndex); - @if (!col.AutoIncrement) + if (!col.AutoIncrement) { - @Html.PadLeft(6)@col.Name@(colIndex == table.Columns.Count() - 1 ? "" : ",") - @Html.NewLine() + @PadLeft(6)@col.Name@(colIndex == table.Columns.Count() - 1 ? "" : ",") + @NewLine() } } ) @@ -32,11 +33,11 @@ @for (var colIndex = 0; colIndex < table.Columns.Count(); colIndex++) { var col = table.Columns.ElementAt(colIndex); - @if (!col.AutoIncrement) + if (!col.AutoIncrement) { - @Html.PadLeft(6)#{@col.ConvertedName} + @PadLeft(6)#{@col.ConvertedName} @(colIndex == table.Columns.Count() - 1 ? "" : ",") - @Html.NewLine() + @NewLine() } } ) diff --git a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-Query.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-Query.cshtml index e96e090..3bebac1 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-Query.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-Query.cshtml @@ -1,6 +1,6 @@ @using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; var dbSource = Model.GetDataSource(); diff --git a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-QueryByPage.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-QueryByPage.cshtml index 604459c..d3c267f 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-QueryByPage.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-QueryByPage.cshtml @@ -1,6 +1,6 @@ @using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; var dbSource = Model.GetDataSource(); @@ -16,5 +16,5 @@ \ No newline at end of file diff --git a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-Update.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-Update.cshtml index 16d5682..1334c8b 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-Update.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/CURD/SqlMap-Update.cshtml @@ -1,6 +1,7 @@ -@using SmartCode +@using System.Linq +@using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; var dbSource = Model.GetDataSource(); @@ -11,20 +12,19 @@ throw new SmartCodeException($"{table.Name} can not find PKColumn！"); } } - update @table.Name @for (var colIndex = 0; colIndex < table.Columns.Count(); colIndex++) { var col = table.Columns.ElementAt(colIndex); - @if (col.IsPrimaryKey) + if (col.IsPrimaryKey) { continue; } - @Html.PadLeft(6)@col.Name = #{@col.ConvertedName} + @PadLeft(6)@col.Name = #{@col.ConvertedName} @(colIndex == table.Columns.Count() - 1 ? "" : ",") - @Html.NewLine() + @NewLine() } where @pkCol.Name=#{@pkCol.Name} diff --git a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-Columns.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-Columns.cshtml index 05b88ae..4679123 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-Columns.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-Columns.cshtml @@ -1,6 +1,7 @@ -@using SmartCode +@using System.Linq +@using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; var dbSource = Model.GetDataSource(); @@ -13,5 +14,5 @@ var col = table.Columns.ElementAt(colIndex); @($"{col.Name}")@(colIndex == table.Columns.Count() - 1 ? "" : ",") } - @Html.NewLine() + @NewLine() \ No newline at end of file diff --git a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-MySql.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-MySql.cshtml index 5f53444..75078e5 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-MySql.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-MySql.cshtml @@ -1,8 +1,7 @@ @using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ - Layout = "_SqlMapLayout.cshtml"; var project = Model.Project; var dbSource = Model.GetDataSource(); var buildTask = Model.Build; @@ -14,13 +13,21 @@ } var resultMapName = $"{table.ConvertedName}ResultMap"; + + var repositoryName = $"{project.Module}.{buildTask.Module}.{table.ConvertedName}Repository"; } -@section QueryByPage -{ - -} \ No newline at end of file + + + @Include("SqlMap-ResultMaps.cshtml", Model) + @Include("SqlMap-Columns.cshtml", Model) + @Include("SqlMap-WhereQueryParams.cshtml", Model) + @Include("./CURD/SqlMap-Insert.cshtml", Model) + @Include("./CURD/SqlMap-Delete.cshtml", Model) + @Include("./CURD/SqlMap-Update.cshtml", Model) + @Include("./CURD/SqlMap-Query.cshtml", Model) + @Include("./CURD/SqlMap-QueryByPage.cshtml", Model) + @Include("./CURD/SqlMap-GetTotal.cshtml", Model) + @Include("./CURD/SqlMap-GetEntity.cshtml", Model) + @Include("./CURD/SqlMap-GetById.cshtml", Model) + \ No newline at end of file diff --git a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-PostgreSql.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-PostgreSql.cshtml index 5f53444..75078e5 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-PostgreSql.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-PostgreSql.cshtml @@ -1,8 +1,7 @@ @using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ - Layout = "_SqlMapLayout.cshtml"; var project = Model.Project; var dbSource = Model.GetDataSource(); var buildTask = Model.Build; @@ -14,13 +13,21 @@ } var resultMapName = $"{table.ConvertedName}ResultMap"; + + var repositoryName = $"{project.Module}.{buildTask.Module}.{table.ConvertedName}Repository"; } -@section QueryByPage -{ - -} \ No newline at end of file + + + @Include("SqlMap-ResultMaps.cshtml", Model) + @Include("SqlMap-Columns.cshtml", Model) + @Include("SqlMap-WhereQueryParams.cshtml", Model) + @Include("./CURD/SqlMap-Insert.cshtml", Model) + @Include("./CURD/SqlMap-Delete.cshtml", Model) + @Include("./CURD/SqlMap-Update.cshtml", Model) + @Include("./CURD/SqlMap-Query.cshtml", Model) + @Include("./CURD/SqlMap-QueryByPage.cshtml", Model) + @Include("./CURD/SqlMap-GetTotal.cshtml", Model) + @Include("./CURD/SqlMap-GetEntity.cshtml", Model) + @Include("./CURD/SqlMap-GetById.cshtml", Model) + \ No newline at end of file diff --git a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-ResultMaps.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-ResultMaps.cshtml index 0b9b20f..b947195 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-ResultMaps.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-ResultMaps.cshtml @@ -1,8 +1,9 @@ -@using SmartCode +@using System +@using SmartCode @using SmartCode.Db @using SmartCode.Generator @using SmartCode.Generator.Entity -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; @@ -44,8 +45,6 @@ return String.IsNullOrEmpty(jdbcType) ? "" : $" jdbcType=\"{jdbcType}\""; } } - - @foreach (var col in table.Columns) diff --git a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-SqlServer.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-SqlServer.cshtml index edf1342..cdcc367 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-SqlServer.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-SqlServer.cshtml @@ -1,9 +1,10 @@ -@using SmartCode +@using System +@using System.Linq +@using SmartCode @using SmartCode.Db @using System.Text.RegularExpressions -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ - Layout = "_SqlMapLayout.cshtml"; var project = Model.Project; var dbSource = Model.GetDataSource(); var versionNo = 2008; @@ -27,10 +28,28 @@ var notEqCols = table.Columns.Where(m => m.ConvertedName != m.Name); var resultMapName = $"{table.ConvertedName}ResultMap"; var queryStatementResultMap = table.HasColNameNotEqConvertedName ? $"ResultMap=\"{resultMapName}\"" : ""; + + var repositoryName = $"{project.Module}.{buildTask.Module}.{table.ConvertedName}Repository"; } -@section QueryByPage -{ + + + @Include("SqlMap-ResultMaps.cshtml", Model) + @Include("SqlMap-Columns.cshtml", Model) + @Include("SqlMap-WhereQueryParams.cshtml", Model) + @Include("./CURD/SqlMap-Insert.cshtml", Model) + @Include("./CURD/SqlMap-Delete.cshtml", Model) + @Include("./CURD/SqlMap-Update.cshtml", Model) + + + + -} - -@section GetEntity -{ + @Include("./CURD/SqlMap-GetTotal.cshtml", Model) + -} - -@section Query -{ - - -} \ No newline at end of file + @Include("./CURD/SqlMap-GetById.cshtml", Model) + \ No newline at end of file diff --git a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-WhereQueryParams.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-WhereQueryParams.cshtml index 43d54e1..11618d3 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-WhereQueryParams.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/SqlMap-WhereQueryParams.cshtml @@ -1,6 +1,6 @@ @using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; var dbSource = Model.GetDataSource(); diff --git a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/_SqlMapLayout.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/_SqlMapLayout.cshtml index a69ea30..41288d1 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/_SqlMapLayout.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap-Partials/_SqlMapLayout.cshtml @@ -1,6 +1,6 @@ @using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; var dbSource = Model.GetDataSource(); diff --git a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap.cshtml index bd9468e..3925950 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/SqlMap.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/SqlMap.cshtml @@ -1,12 +1,12 @@ @using SmartCode @using SmartCode.Db -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var project = Model.Project; var dbSource = Model.GetDataSource(); } -@{ await Html.RenderPartialAsync($"./SqlMap-Partials/SqlMap-{dbSource.DbProvider.Name}.cshtml", Model); } +@Include($"./SqlMap-Partials/SqlMap-{dbSource.DbProvider.Name}.cshtml", Model) \ No newline at end of file diff --git a/src/SmartCode.Generator/RazorTemplates/Java/Test/Application-Test.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/Test/Application-Test.cshtml index b524926..9d974c4 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/Test/Application-Test.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/Test/Application-Test.cshtml @@ -1,7 +1,6 @@ @using SmartCode -@model BuildContext +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ - Layout = "../_JavaLayout.cshtml"; var project = Model.Project; var appName = "Demo"; @@ -12,6 +11,7 @@ } var appClassTestsName = $"{appName}ApplicationTests"; } +@Include("../Copyright.cshtml", Model) package @(project.Module).server; diff --git a/src/SmartCode.Generator/RazorTemplates/Java/_JavaLayout.cshtml b/src/SmartCode.Generator/RazorTemplates/Java/_JavaLayout.cshtml index 15059b9..e278e23 100644 --- a/src/SmartCode.Generator/RazorTemplates/Java/_JavaLayout.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Java/_JavaLayout.cshtml @@ -1,4 +1,4 @@ @using SmartCode -@model BuildContext -@{ await Html.RenderPartialAsync("Copyright.cshtml", Model); } -@RenderBody() +@inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate +@Include("Copyright.cshtml", Model) +@* @RenderBody() *@ diff --git a/src/SmartCode.Generator/RazorTemplates/Sql/DbToMySql.cshtml b/src/SmartCode.Generator/RazorTemplates/Sql/DbToMySql.cshtml index 38267e7..731ca5d 100644 --- a/src/SmartCode.Generator/RazorTemplates/Sql/DbToMySql.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Sql/DbToMySql.cshtml @@ -1,4 +1,6 @@ -@using SmartCode +@using System +@using System.Linq +@using SmartCode @inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var all_table = Model.GetCurrentAllTable(); @@ -32,7 +34,7 @@ @for (var colIndex = 0; colIndex < table.Columns.Count(); colIndex++) { var col = table.Columns.ElementAt(colIndex); - @col.ConvertedName @PadLeft(4) @GetPGSqlType(col) @PadLeft(4) @(col.IsNullable ? "null" : "not null") @(col.IsPrimaryKey?" primary key":"") @(col.AutoIncrement?" AUTO_INCREMENT":"") @if (!String.IsNullOrEmpty(col.Description)) + @col.ConvertedName @PadLeft(4) @GetPGSqlType(col) @PadLeft(4) @(col.IsNullable ? "null" : "not null") @(col.IsPrimaryKey?" primary key":"") @(col.AutoIncrement?" AUTO_INCREMENT":"") if (!String.IsNullOrEmpty(col.Description)) { comment '@col.Description' } if (colIndex < table.Columns.Count() - 1) diff --git a/src/SmartCode.Generator/RazorTemplates/Sql/DbToPGSql.cshtml b/src/SmartCode.Generator/RazorTemplates/Sql/DbToPGSql.cshtml index 019d60d..5333981 100644 --- a/src/SmartCode.Generator/RazorTemplates/Sql/DbToPGSql.cshtml +++ b/src/SmartCode.Generator/RazorTemplates/Sql/DbToPGSql.cshtml @@ -1,4 +1,5 @@ -@using SmartCode +@using System +@using SmartCode @inherits SmartCode.TemplateEngine.Impl.RazorCoreTemplate @{ var all_table = Model.GetCurrentAllTable(); @@ -47,7 +48,7 @@ @NewLine() @foreach (var col in table.Columns) { - @if (!String.IsNullOrEmpty(col.Description)) + if (!String.IsNullOrEmpty(col.Description)) { comment on column @($"{table.ConvertedName}.{col.ConvertedName}") is '@col.Description'; } diff --git a/src/SmartCode.TemplateEngine/Impl/RazorCoreHelper.cs b/src/SmartCode.TemplateEngine/Impl/RazorCoreHelper.cs index dd5bbd3..590efe1 100644 --- a/src/SmartCode.TemplateEngine/Impl/RazorCoreHelper.cs +++ b/src/SmartCode.TemplateEngine/Impl/RazorCoreHelper.cs @@ -25,6 +25,8 @@ BuildContext context builder => { builder.AddAssemblyReferenceByName("System.Data.Common"); builder.AddAssemblyReferenceByName("System.Text.RegularExpressions"); + builder.AddAssemblyReferenceByName("MySql.Data"); + builder.AddAssemblyReferenceByName("Npgsql"); builder.AddAssemblyReferenceByName("SmartCode"); builder.AddAssemblyReferenceByName("SmartCode.App"); builder.AddAssemblyReferenceByName("SmartCode.Db");