diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/DataSeed/FieldDataSeed.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/DataSeed/FieldDataSeed.cs new file mode 100644 index 00000000..3fea3340 --- /dev/null +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/DataSeed/FieldDataSeed.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Furion; +using Furion.DependencyInjection; +using Yi.Framework.Infrastructure.Data.DataSeeds; +using Yi.Framework.Infrastructure.Ddd.Repositories; +using Yi.Framework.Module.WebFirstManager.Entities; +using Yi.Framework.Module.WebFirstManager.Enums; + +namespace Yi.Framework.Module.WebFirstManager.DataSeed +{ + public class FieldDataSeed : AbstractDataSeed, ITransient + { + private TableEntity _tableEntity; + public FieldDataSeed(IRepository repository) : base(repository) + { + } + + public override async Task IsInvoker() + { + var tableRepository = App.GetRequiredService>(); + _tableEntity = await tableRepository.GetFirstAsync(x => x.Name == "Test"); + if (_tableEntity is null) + { + return false; + } + return await base.IsInvoker(); + } + + public override List GetSeedData() + { + + + var entities = new List(); + entities.Add(new FieldEntity + { + FieldType = FieldTypeEnum.String, + Description = "测试字段", + Name = "DDD", + Length = 100, + TableId = _tableEntity.Id + + }); + return entities; + } + } +} diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/DataSeed/TableDataSeed.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/DataSeed/TableDataSeed.cs new file mode 100644 index 00000000..61cc6258 --- /dev/null +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/DataSeed/TableDataSeed.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Furion.DependencyInjection; +using Yi.Framework.Infrastructure.Data.DataSeeds; +using Yi.Framework.Infrastructure.Ddd.Repositories; +using Yi.Framework.Infrastructure.Helper; +using Yi.Framework.Module.WebFirstManager.Entities; + +namespace Yi.Framework.Module.WebFirstManager.DataSeed +{ + public class TableDataSeed : AbstractDataSeed, ITransient + { + public TableDataSeed(IRepository repository) : base(repository) + { + } + + public override List GetSeedData() + { + var entities=new List(); + + entities.Add(new TableEntity + { + Id=SnowflakeHelper.NextId, + Name="Test", + Description="测试", + }); + return entities; + } + } +} diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/DataSeed/TemplateDataSeed.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/DataSeed/TemplateDataSeed.cs new file mode 100644 index 00000000..30e188fa --- /dev/null +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/DataSeed/TemplateDataSeed.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Furion.DependencyInjection; +using Yi.Framework.Infrastructure.Data.DataSeeds; +using Yi.Framework.Infrastructure.Ddd.Repositories; +using Yi.Framework.Infrastructure.Helper; +using Yi.Framework.Module.WebFirstManager.Entities; + +namespace Yi.Framework.Module.WebFirstManager.DataSeed +{ + public class TemplateDataSeed : AbstractDataSeed, ITransient + { + public TemplateDataSeed(IRepository repository) : base(repository) + { + } + + public override List GetSeedData() + { + var entities = new List(); + entities.Add(new TemplateEntity + { + Id = SnowflakeHelper.NextId, + TemplateStr = "你好世界 :@model", + BuildPath = "" + }); + + entities.Add(new TemplateEntity + { + Id = SnowflakeHelper.NextId, + TemplateStr = "你好世界2 :@Model", + BuildPath = "" + }); + + + return entities; + } + } +} diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Domain/TemplateManager.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Domain/TemplateManager.cs index 05ac7c14..19ee6906 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Domain/TemplateManager.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Domain/TemplateManager.cs @@ -40,7 +40,8 @@ namespace Yi.Framework.Module.WebFirstManager.Domain private async Task BuildToFileAsync(string str, TemplateEntity templateEntity) { - await File.WriteAllTextAsync(str, templateEntity.BuildPath); + + //await File.WriteAllTextAsync(str, templateEntity.BuildPath); } } diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Field/FieldCreateInput.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Field/FieldCreateInput.cs deleted file mode 100644 index 012f6b49..00000000 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Field/FieldCreateInput.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Yi.Framework.Module.WebFirstManager.Enums; - -namespace Yi.Framework.Module.WebFirstManager.Dtos.Field -{ - public class FieldCreateInput - { - /// - /// 字段名称 - /// - public string Name { get; set; } - public string? Description { get; set; } - - public int OrderNum { get; set; } - public int Length { get; set; } - - public FieldTypeEnum FieldType { get; set; } - - public long TableId { get; set; } - - /// - /// 是否必填 - /// - public bool IsRequired { get; set; } - - /// - /// 是否主键 - /// - public bool IsKey { get; set; } - - /// - /// 是否自增 - /// - public bool IsAutoAdd { get; set; } - - /// - /// 是否公共 - /// - public bool IsPublic { get; set; } - } -} diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Field/FieldGetOutDto.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Field/FieldDto.cs similarity index 95% rename from Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Field/FieldGetOutDto.cs rename to Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Field/FieldDto.cs index 75785126..3bb7d26e 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Field/FieldGetOutDto.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Field/FieldDto.cs @@ -8,9 +8,8 @@ using Yi.Framework.Module.WebFirstManager.Enums; namespace Yi.Framework.Module.WebFirstManager.Dtos.Field { - public class FieldGetOutDto:IEntityDto + public class FieldDto : IEntityDto { - public long Id { get; set; } /// /// 字段名称 /// @@ -43,5 +42,6 @@ namespace Yi.Framework.Module.WebFirstManager.Dtos.Field /// 是否公共 /// public bool IsPublic { get; set; } + public long Id { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Field/FieldGetListOutputDto.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Field/FieldGetListOutputDto.cs deleted file mode 100644 index 4ad3fedc..00000000 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Field/FieldGetListOutputDto.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Yi.Framework.Infrastructure.Ddd.Dtos.Abstract; -using Yi.Framework.Module.WebFirstManager.Enums; - -namespace Yi.Framework.Module.WebFirstManager.Dtos.Field -{ - public class FieldGetListOutputDto:IEntityDto - { - public long Id { get; set; } - /// - /// 字段名称 - /// - public string Name { get; set; } - public string? Description { get; set; } - - public int OrderNum { get; set; } - public int Length { get; set; } - - public FieldTypeEnum FieldType { get; set; } - - public long TableId { get; set; } - - /// - /// 是否必填 - /// - public bool IsRequired { get; set; } - - /// - /// 是否主键 - /// - public bool IsKey { get; set; } - - /// - /// 是否自增 - /// - public bool IsAutoAdd { get; set; } - - /// - /// 是否公共 - /// - public bool IsPublic { get; set; } - } -} diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Field/FieldUpdateInput.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Field/FieldUpdateInput.cs deleted file mode 100644 index da2065e5..00000000 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Field/FieldUpdateInput.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Yi.Framework.Module.WebFirstManager.Enums; - -namespace Yi.Framework.Module.WebFirstManager.Dtos.Field -{ - public class FieldUpdateInput - { - /// - /// 字段名称 - /// - public string? Name { get; set; } - public string? Description { get; set; } - - public int? OrderNum { get; set; } - public int? Length { get; set; } - - public FieldTypeEnum? FieldType { get; set; } - - public long? TableId { get; set; } - - /// - /// 是否必填 - /// - public bool? IsRequired { get; set; } - - /// - /// 是否主键 - /// - public bool? IsKey { get; set; } - - /// - /// 是否自增 - /// - public bool? IsAutoAdd { get; set; } - - /// - /// 是否公共 - /// - public bool? IsPublic { get; set; } - } -} diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Table/TableDto.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Table/TableDto.cs new file mode 100644 index 00000000..e6c92bd6 --- /dev/null +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Table/TableDto.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +using Yi.Framework.Infrastructure.Ddd.Dtos.Abstract; +using Yi.Framework.Module.WebFirstManager.Entities; + +namespace Yi.Framework.Module.WebFirstManager.Dtos.Table +{ + public class TableDto: IEntityDto + { + public long Id { get; set; } + /// + /// 表名 + /// + public string Name { get; set; } + + /// + /// 备注 + /// + public string? Description { get; set; } + + /// + /// 一表多字段 + /// + public List Fields { get; set; } + } +} diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Table/TableGetListInput.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Table/TableGetListInput.cs new file mode 100644 index 00000000..45b1334a --- /dev/null +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Table/TableGetListInput.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Infrastructure.Ddd.Dtos; + +namespace Yi.Framework.Module.WebFirstManager.Dtos.Table +{ + public class TableGetListInput : PagedAndSortedResultRequestDto + { + } +} diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Template/TemplateDto.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Template/TemplateDto.cs index 1cb03a1c..eeaaff6d 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Template/TemplateDto.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Template/TemplateDto.cs @@ -3,10 +3,22 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Yi.Framework.Infrastructure.Ddd.Dtos.Abstract; namespace Yi.Framework.Module.WebFirstManager.Dtos.Template { - public class TemplateDto + public class TemplateDto : IEntityDto { + public long Id { get; set; } + + /// + /// 模板字符串 + /// + public string TemplateStr { get; set; } = string.Empty; + + /// + /// 生成路径 + /// + public string BuildPath { get; set; } } } diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Template/TemplateGetListInput.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Template/TemplateGetListInput.cs new file mode 100644 index 00000000..8da1fafe --- /dev/null +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/Template/TemplateGetListInput.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Infrastructure.Ddd.Dtos; + +namespace Yi.Framework.Module.WebFirstManager.Dtos.Template +{ + public class TemplateGetListInput : PagedAndSortedResultRequestDto + { + } +} diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/WebFirst/WebFirstGetOutputDto.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/WebFirst/WebFirstDto.cs similarity index 83% rename from Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/WebFirst/WebFirstGetOutputDto.cs rename to Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/WebFirst/WebFirstDto.cs index 5d0815d1..07afaff8 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/WebFirst/WebFirstGetOutputDto.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Dtos/WebFirst/WebFirstDto.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Yi.Framework.Module.WebFirstManager.Dtos.WebFirst { - public class WebFirstGetOutputDto + public class WebFirstDto { } } diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Entities/FieldEntity.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Entities/FieldEntity.cs index 17fb1f99..0d58ea9c 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Entities/FieldEntity.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Entities/FieldEntity.cs @@ -9,6 +9,7 @@ using Yi.Framework.Module.WebFirstManager.Enums; namespace Yi.Framework.Module.WebFirstManager.Entities { + [SugarTable("Field")] public class FieldEntity : IEntity { [SugarColumn(IsPrimaryKey = true)] diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Entities/TableEntity.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Entities/TableEntity.cs index f24ec3c1..0cb29d27 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Entities/TableEntity.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Entities/TableEntity.cs @@ -8,6 +8,7 @@ using Yi.Framework.Infrastructure.Ddd.Entities; namespace Yi.Framework.Module.WebFirstManager.Entities { + [SugarTable("Table")] public class TableEntity : IEntity { [SugarColumn(IsPrimaryKey = true)] @@ -20,6 +21,7 @@ namespace Yi.Framework.Module.WebFirstManager.Entities /// /// 备注 /// + public string? Description { get; set; } /// diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Entities/TemplateEntity.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Entities/TemplateEntity.cs index df85a758..1cc3665b 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Entities/TemplateEntity.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Entities/TemplateEntity.cs @@ -9,6 +9,7 @@ using Yi.Framework.Infrastructure.Ddd.Entities; namespace Yi.Framework.Module.WebFirstManager.Entities { + [SugarTable("Template")] public class TemplateEntity : IEntity { diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Enums/FieldTypeEnum.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Enums/FieldTypeEnum.cs index f7fecf8c..152cd191 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Enums/FieldTypeEnum.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Enums/FieldTypeEnum.cs @@ -3,13 +3,19 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using EasyTool; namespace Yi.Framework.Module.WebFirstManager.Enums { public enum FieldTypeEnum { + [Description("string")] String, + + [Description("int")] Int, + + [Description("long")] Long } } diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Handler/FieldTemplateHandler.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Handler/FieldTemplateHandler.cs index b57b2fea..ffb33088 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Handler/FieldTemplateHandler.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Handler/FieldTemplateHandler.cs @@ -1,20 +1,54 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Text; +using EasyTool; using Furion.DependencyInjection; namespace Yi.Framework.Module.WebFirstManager.Handler { - internal class FieldTemplateHandler : TemplateHandlerBase, ITemplateHandler,ISingleton + public class FieldTemplateHandler : TemplateHandlerBase, ITemplateHandler, ISingleton { public string Invoker(string str) { - //从数据库中获取到全部字段,然后根据字段生成字符串,进行替换 - return str.Replace("@field", ""); + return str.Replace("@field", BuildFields()); } + /// + /// 生成Fields + /// + /// + public string BuildFields() + { + StringBuilder fieldStrs = new StringBuilder(); + + + foreach (var field in Fields) + { + var typeStr = EnumUtil.GetDescriptionByValue(field.FieldType); + var nameStr = field.Name; + + //添加备注 + if (string.IsNullOrEmpty(field.Description)) + { + var desStr = "/// " + + @$"///{field.Description}" + + "/// "; + fieldStrs.AppendLine(desStr); + } + + //添加长度 + if (field.Length != 0) + { + var lengthStr = $"[SugarColumn(Length ={field.Length})]"; + fieldStrs.AppendLine(lengthStr); + } + + //添加字段 + var fieldStr = $"public {typeStr} {nameStr} {{ get; set; }}"; + + fieldStrs.AppendLine(fieldStr); + } + + return fieldStrs.ToString(); + } } } diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Handler/ModelTemplateHandler.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Handler/ModelTemplateHandler.cs index a23d12fe..4a7da203 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Handler/ModelTemplateHandler.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Handler/ModelTemplateHandler.cs @@ -8,7 +8,7 @@ using Furion.DependencyInjection; namespace Yi.Framework.Module.WebFirstManager.Handler { - internal class ModelTemplateHandler : TemplateHandlerBase, ITemplateHandler, ISingleton + public class ModelTemplateHandler : TemplateHandlerBase, ITemplateHandler, ISingleton { public string Invoker(string str) { diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Handler/NameSpaceTemplateHandler.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Handler/NameSpaceTemplateHandler.cs index 11775f89..10f1f9a6 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Handler/NameSpaceTemplateHandler.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Handler/NameSpaceTemplateHandler.cs @@ -7,11 +7,11 @@ using Furion.DependencyInjection; namespace Yi.Framework.Module.WebFirstManager.Handler { - internal class NameSpaceTemplateHandler : TemplateHandlerBase, ITemplateHandler, ISingleton + public class NameSpaceTemplateHandler : TemplateHandlerBase, ITemplateHandler, ISingleton { public string Invoker(string str) { - return str.Replace("@Namespace", ""); + return str.Replace("@namespace", ""); } } } diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/IFieldService.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/IFieldService.cs index 3f413966..fb253102 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/IFieldService.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/IFieldService.cs @@ -8,7 +8,7 @@ using Yi.Framework.Module.WebFirstManager.Dtos.Field; namespace Yi.Framework.Module.WebFirstManager { - public interface IFieldService : ICrudAppService + public interface IFieldService : ICrudAppService { } } diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/ITableService.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/ITableService.cs index f7a09a46..dc97a2d0 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/ITableService.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/ITableService.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Yi.Framework.Infrastructure.Ddd.Services.Abstract; +using Yi.Framework.Module.WebFirstManager.Dtos.Table; namespace Yi.Framework.Module.WebFirstManager { - public interface ITableService + public interface ITableService : ICrudAppService { } } diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/ITemplateService.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/ITemplateService.cs index 7c5c34a4..bd03b812 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/ITemplateService.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/ITemplateService.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Yi.Framework.Infrastructure.Ddd.Services.Abstract; +using Yi.Framework.Module.WebFirstManager.Dtos.Template; namespace Yi.Framework.Module.WebFirstManager { - public interface ITemplateService + public interface ITemplateService : ICrudAppService { } } diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/IWebFirstService.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/IWebFirstService.cs index 9cec1608..ee352cbb 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/IWebFirstService.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/IWebFirstService.cs @@ -3,10 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Yi.Framework.Infrastructure.Ddd.Services.Abstract; namespace Yi.Framework.Module.WebFirstManager { - public interface IWebFirstService + public interface IWebFirstService:IApplicationService { } } diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/FieldService.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/FieldService.cs index 58dc5832..4117aef1 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/FieldService.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/FieldService.cs @@ -16,7 +16,7 @@ namespace Yi.Framework.Module.WebFirstManager.Impl /// 字段管理 /// [ApiDescriptionSettings("WebFirstManager")] - public class FieldService:CrudAppService ,IFieldService,ITransient,IDynamicApiController + public class FieldService:CrudAppService ,IFieldService,ITransient,IDynamicApiController { } } diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/TableService.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/TableService.cs index b340d5a1..aef4afc6 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/TableService.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/TableService.cs @@ -6,11 +6,15 @@ using System.Threading.Tasks; using Furion.DependencyInjection; using Furion.DynamicApiController; using Microsoft.AspNetCore.Mvc; +using Yi.Framework.Infrastructure.Ddd.Services; +using Yi.Framework.Module.WebFirstManager.Dtos.Table; +using Yi.Framework.Module.WebFirstManager.Dtos.Template; +using Yi.Framework.Module.WebFirstManager.Entities; namespace Yi.Framework.Module.WebFirstManager.Impl { [ApiDescriptionSettings("WebFirstManager")] - public class TableService:ITableService, ITransient,IDynamicApiController + public class TableService : CrudAppService ,ITableService, ITransient, IDynamicApiController { } } diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/TemplateService.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/TemplateService.cs index 32b2b9cd..1044460a 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/TemplateService.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/TemplateService.cs @@ -6,11 +6,14 @@ using System.Threading.Tasks; using Furion.DependencyInjection; using Furion.DynamicApiController; using Microsoft.AspNetCore.Mvc; +using Yi.Framework.Infrastructure.Ddd.Services; +using Yi.Framework.Module.WebFirstManager.Dtos.Template; +using Yi.Framework.Module.WebFirstManager.Entities; namespace Yi.Framework.Module.WebFirstManager.Impl { [ApiDescriptionSettings("WebFirstManager")] - public class TemplateService: ITemplateService, IDynamicApiController, ITransient + public class TemplateService : CrudAppService, ITemplateService, IDynamicApiController, ITransient { } } diff --git a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/WebFirstService.cs b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/WebFirstService.cs index 905642e2..9a19f395 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/WebFirstService.cs +++ b/Yi.Furion.Net6/Yi.Framework.Module/WebFirstManager/Impl/WebFirstService.cs @@ -28,10 +28,10 @@ namespace Yi.Framework.Module.WebFirstManager.Impl } /// - /// 一键构建生成代码 + /// Web To Code /// /// - public async Task PostBuildCodeAsync() + public async Task PostWebBuildCodeAsync() { //获取全部表 var tables = await _tableRepository.GetListAsync(); @@ -44,10 +44,27 @@ namespace Yi.Framework.Module.WebFirstManager.Impl /// - /// 一键构建生成表 + /// Web To Db /// /// - public async Task PostBuildTableAsync() + public async Task PostWebBuildDbAsync() + { + } + + /// + /// Code To Web + /// + /// + public async Task PostCodeBuildWebAsync() + { + } + + + /// + /// Code To Db + /// + /// + public async Task PostCodeBuildDbAsync() { } } diff --git a/Yi.Furion.Net6/Yi.Framework.Module/Yi.Framework.Module.csproj b/Yi.Furion.Net6/Yi.Framework.Module/Yi.Framework.Module.csproj index f06491b9..7c74970e 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/Yi.Framework.Module.csproj +++ b/Yi.Furion.Net6/Yi.Framework.Module/Yi.Framework.Module.csproj @@ -41,7 +41,6 @@ - diff --git a/Yi.Furion.Net6/Yi.Framework.Module/Yi.Framework.Module.xml b/Yi.Furion.Net6/Yi.Framework.Module/Yi.Framework.Module.xml index 5ad6db15..5815be68 100644 --- a/Yi.Furion.Net6/Yi.Framework.Module/Yi.Framework.Module.xml +++ b/Yi.Furion.Net6/Yi.Framework.Module/Yi.Framework.Module.xml @@ -391,27 +391,27 @@ 模板领域服务 - + 字段名称 - + 是否必填 - + 是否主键 - + 是否自增 - + 是否公共 @@ -421,79 +421,29 @@ 字段名称 - + - 字段名称 + 表名 - + - 是否必填 + 备注 - + - 是否主键 + 一表多字段 - + - 是否自增 + 模板字符串 - + - 是否公共 - - - - - 字段名称 - - - - - 是否必填 - - - - - 是否主键 - - - - - 是否自增 - - - - - 是否公共 - - - - - 字段名称 - - - - - 是否必填 - - - - - 是否主键 - - - - - 是否自增 - - - - - 是否公共 + 生成路径 @@ -546,28 +496,39 @@ 生成路径 + + + 生成Fields + + + 字段管理 - + - 一键构建生成代码 + Web To Code - + - 一键构建生成表 + Web To Db - + - 每次去构建一张表的数据 + Code To Web + + + + + + Code To Db - diff --git a/Yi.Furion.Net6/Yi.Furion.Web.Entry/appsettings.json b/Yi.Furion.Net6/Yi.Furion.Web.Entry/appsettings.json index f44259b1..dac6150c 100644 --- a/Yi.Furion.Net6/Yi.Furion.Web.Entry/appsettings.json +++ b/Yi.Furion.Net6/Yi.Furion.Web.Entry/appsettings.json @@ -49,6 +49,7 @@ ] }, + //是否开启种子数据 "EnabledDataSeed": false, "JWTSettings": {