xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

模板重新生成可空类型

Browse Source
This commit is contained in:
陈淳
2023-01-06 11:12:47 +08:00
parent 576397a042
commit 29df3d658b
52 changed files with 573 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
View File

@@ -391,41 +391,6 @@
<param name="ids"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.StudentController.Create(Yi.Framework.DtoModel.RABC.Student.StudentCreateInput)">
<summary>
增
</summary>
<param name="studentCreateInput"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.StudentController.GetById(System.Guid)">
<summary>
查
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.StudentController.GetLsit">
<summary>
查
</summary>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.StudentController.Del(System.Collections.Generic.List{System.Guid})">
<summary>
删
</summary>
<param name="ids"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.StudentController.Update(System.Guid,Yi.Framework.DtoModel.RABC.Student.StudentUpdateInput)">
<summary>
更
</summary>
<param name="id"></param>
<param name="studentUpdateInput"></param>
<returns></returns>
</member>
<member name="T:Yi.Framework.ApiMicroservice.Controllers.AccountController">
<summary>
账户管理

96
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/StudentController.cs
View File

@@ -1,96 +0,0 @@
using Microsoft.AspNetCore.Mvc;
using Yi.Framework.Common.Models;
using Yi.Framework.DtoModel.RABC.Student;
using Yi.Framework.Interface.RABC;
namespace Yi.Framework.ApiMicroservice.Controllers.ERP
{
[ApiController]
[Route("[controller]")]
public class StudentController : ControllerBase
{
private readonly ILogger<StudentController> _logger;
private readonly IStudentService _studentService;
public StudentController(ILogger<StudentController> logger, IStudentService studentService)
{
_logger = logger;
_studentService = studentService;
}
[HttpDelete]
[Route("ErrorTest")]
public Result<bool> ErrorTest()
{
_studentService.GetError();
return Result<bool>.Success();
}
/// <summary>
/// <20><>
/// </summary>
/// <param name="studentCreateInput"></param>
/// <returns></returns>
[HttpPost]
public async Task<Result<StudentGetOutput>> Create(StudentCreateInput studentCreateInput)
{
var result = await _studentService.CreateAsync(studentCreateInput);
return Result<StudentGetOutput>.Success().SetData(result);
}
/// <summary>
/// <20><>
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet]
[Route("{id}")]
public async Task<Result<StudentGetOutput>> GetById(Guid id)
{
var result = await _studentService.GetByIdAsync(id);
return Result<StudentGetOutput>.Success().SetData(result);
}
/// <summary>
/// <20><>
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<Result<List<StudentListOutput>>> GetLsit()
{
var result = await _studentService.GetListAsync();
return Result<List<StudentListOutput>>.Success().SetData(result);
}
/// <summary>
/// ɾ
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
[HttpDelete]
public async Task<Result<bool>> Del(List<Guid> ids)
{
await _studentService.DeleteAsync(ids);
return Result<bool>.Success();
}
/// <summary>
/// <20><>
/// </summary>
/// <param name="id"></param>
/// <param name="studentUpdateInput"></param>
/// <returns></returns>
[HttpPut]
[Route("{id}")]
public async Task<Result<StudentGetOutput>> Update(Guid id, StudentUpdateInput studentUpdateInput)
{
var result = await _studentService.UpdateAsync(id, studentUpdateInput);
return Result<StudentGetOutput>.Success().SetData(result);
}
}
}

BIN
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
View File

Binary file not shown.

8
Yi.Framework.Net6/Yi.Framework.Common/Helper/EmailHelper.cs
View File

@@ -9,10 +9,10 @@ namespace Yi.Framework.Common.Helper
{
public class EmailHelper
{
public static string fromMail { get; set; }
public static string pwdMail { get; set; }
public static string senderMail { get; set; }
public static string subjectMail { get; set; }
public static string fromMail { get; set; } = string.Empty;
public static string pwdMail { get; set; } = string.Empty;
public static string senderMail { get; set; } = string.Empty;
public static string subjectMail { get; set; } = string.Empty;
public static void Init(string fromMail,string pwdMail,string senderMail, string subjectMail)
{
EmailHelper.fromMail = fromMail;

2
Yi.Framework.Net6/Yi.Framework.Common/Models/ITreeModel.cs
View File

@@ -12,6 +12,6 @@ namespace Yi.Framework.Common.Models
public long ParentId { get; set; }
public int OrderNum { get; set; }
public List<T> Children { get; set; }
public List<T>? Children { get; set; }
}
}

6
Yi.Framework.Net6/Yi.Framework.Common/Models/LogModel.cs
View File

@@ -11,8 +11,8 @@ namespace Yi.Framework.Common.Models
/// </summary>
public class LogModel
{
public string OriginalClassName { get; set; }
public string OriginalMethodName { get; set; }
public string Remark { get; set; }
public string OriginalClassName { get; set; } = string.Empty;
public string OriginalMethodName { get; set; } = string.Empty;
public string? Remark { get; set; }
}
}

2
Yi.Framework.Net6/Yi.Framework.Common/Models/PageModel.cs
View File

@@ -16,7 +16,7 @@ namespace Yi.Framework.Common.Models
Total = total;
}
public int Total { get; set; }
public T Data { get; set; }
public T Data { get; set; } = default(T)!;
}
public class PageModel : PageModel<object>

16
Yi.Framework.Net6/Yi.Framework.Common/Models/VueRouterModel.cs
View File

@@ -12,22 +12,22 @@ namespace Yi.Framework.Common.Models
public long ParentId { get; set; }
public int OrderNum { get; set; }
public string Name { get; set; }
public string Path { get; set; }
public string Name { get; set; } = string.Empty;
public string Path { get; set; } = string.Empty;
public bool Hidden { get; set; }
public string Redirect { get; set; }
public string Component { get; set; }
public string Redirect { get; set; } = string.Empty;
public string Component { get; set; } = string.Empty;
public bool AlwaysShow { get; set; }
public Meta Meta { get; set; } = new Meta();
public List<VueRouterModel> Children { get; set; }
public List<VueRouterModel>? Children { get; set; }
}
public class Meta
{
public string Title { get; set; }
public string Icon { get; set; }
public string Title { get; set; } = string.Empty;
public string Icon { get; set; } = string.Empty;
public bool NoCache { get; set; }
public string link { get; set; }
public string link { get; set; } = string.Empty;
}
}

4
Yi.Framework.Net6/Yi.Framework.Common/Options/SqlConnOptions.cs
View File

@@ -5,7 +5,7 @@ namespace Yi.Framework.Common.IOCOptions
{
public class SqlConnOptions
{
public string WriteUrl { get; set; }
public List<string> ReadUrl { get; set; }
public string WriteUrl { get; set; } = string.Empty;
public List<string>? ReadUrl { get; set; }
}
}

2
Yi.Framework.Net6/Yi.Framework.Common/QueueModel/OrderCreateQueueModel.cs
View File

@@ -22,7 +22,7 @@ namespace Yi.Framework.Common.QueueModel
/// <summary>
/// sku ID 集合
/// </summary>
public List<long> SkuIdList { get; set; }
public List<long>? SkuIdList { get; set; }
/// <summary>
/// 尝试次数

4
Yi.Framework.Net6/Yi.Framework.Common/QueueModel/SMSQueueModel.cs
View File

@@ -8,7 +8,7 @@ namespace Yi.Framework.Common.QueueModel
{
public class SMSQueueModel
{
public string code { get; set; }
public string phone { get; set; }
public string? code { get; set; }
public string? phone { get; set; }
}
}

8
Yi.Framework.Net6/Yi.Framework.Common/Yi.Framework.Common.csproj
View File

@@ -5,6 +5,14 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702;CS8618</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<NoWarn>1701;1702;CS8618</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
<PackageReference Include="EPPlus" Version="5.8.4" />

4
Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/GiveRoleSetMenuDto.cs
View File

@@ -8,7 +8,7 @@ namespace Yi.Framework.DtoModel.Base.Dto
{
public class GiveRoleSetMenuDto
{
public List<long> RoleIds { get; set; }
public List<long> MenuIds { get; set; }
public List<long>? RoleIds { get; set; }
public List<long>? MenuIds { get; set; }
}
}

6
Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/RoleInfoDto.cs
View File

@@ -9,8 +9,8 @@ namespace Yi.Framework.DtoModel.Base.Dto
{
public class RoleInfoDto
{
public RoleEntity Role { get; set; }
public List<long> DeptIds { get; set; }
public List<long> MenuIds { get; set; }
public RoleEntity Role { get; set; }=new ();
public List<long> DeptIds { get; set; } = new ();
public List<long> MenuIds { get; set; } = new ();
}
}

4
Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UpdatePasswordDto.cs
View File

@@ -8,7 +8,7 @@ namespace Yi.Framework.DtoModel.Base.Dto
{
public class UpdatePasswordDto
{
public string NewPassword { get; set; }
public string OldPassword { get; set; }
public string NewPassword { get; set; }=string.Empty;
public string OldPassword { get; set; } = string.Empty;
}
}

6
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Material/MaterialCreateUpdateInput.cs
View File

@@ -10,9 +10,9 @@ namespace Yi.Framework.DtoModel.ERP.Material
{
public class MaterialCreateUpdateInput : EntityDto<long>
{
public string? Code { get; set; }
public string? Name { get; set; }
public string? UnitName { get; set; }
public string Code { get; set; }=string.Empty;
public string Name { get; set; }=string.Empty;
public string UnitName { get; set; }=string.Empty;
public string? Remarks { get; set; }
}
}

17
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Material/MaterialGetListInput.cs Normal file
View File

@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Model.Base;
namespace Yi.Framework.DtoModel.ERP.Material
{
public class MaterialGetListInput
{
public string Code { get; set; }=string.Empty;
public string Name { get; set; }=string.Empty;
public string UnitName { get; set; }=string.Empty;
public string? Remarks { get; set; }
}
}

8
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Material/MaterialGetListOutput.cs
View File

@@ -9,9 +9,9 @@ namespace Yi.Framework.DtoModel.ERP.Material
{
public class MaterialGetListOutput: EntityDto<long>
{
public string Code { get; set; }
public string Name { get; set; }
public string UnitName { get; set; }
public string Remarks { get; set; }
public string Code { get; set; }=string.Empty;
public string Name { get; set; }=string.Empty;
public string UnitName { get; set; }=string.Empty;
public string? Remarks { get; set; }
}
}

4
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseGetListOutput.cs
View File

@@ -10,9 +10,9 @@ namespace Yi.Framework.DtoModel.ERP.Purchase
{
public class PurchaseGetListOutput: EntityDto<long>
{
public string Code { get; set; }
public string Code { get; set; } = string.Empty;
public DateTime NeedTime { get; set; }
public string Buyer { get; set; }
public string Buyer { get; set; } = string.Empty;
public long TotalMoney { get; set; }
public long PaidMoney { get; set; }
public PurchaseStateEnum PurchaseState { get; set; }

11
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/PurchaseDetailsCreateUpdateInput.cs
View File

@@ -10,12 +10,11 @@ namespace Yi.Framework.DtoModel.ERP.PurchaseDetails
{
public class PurchaseDetailsCreateUpdateInput : EntityDto<long>
{
public string? MaterialUnit { get; set; }
public string? MaterialName { get; set; }
public float UnitPrice { get; set; }
public long TotalNumber { get; set; }
public long? CompleteNumber { get; set; }
public string MaterialName { get; set; }=string.Empty;
public string MaterialUnit { get; set; }=string.Empty ;
public float UnitPrice { get; set; }
public long TotalNumber { get; set; }
public long CompleteNumber { get; set; }
public string? Remarks { get; set; }
}
}

19
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/PurchaseDetailsGetListInput.cs Normal file
View File

@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Model.Base;
namespace Yi.Framework.DtoModel.ERP.PurchaseDetails
{
public class PurchaseDetailsGetListInput
{
public string MaterialName { get; set; }=string.Empty;
public string MaterialUnit { get; set; }=string.Empty ;
public float UnitPrice { get; set; }
public long TotalNumber { get; set; }
public long CompleteNumber { get; set; }
public string? Remarks { get; set; }
}
}

10
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/PurchaseDetailsGetListOutput.cs
View File

@@ -9,11 +9,11 @@ namespace Yi.Framework.DtoModel.ERP.PurchaseDetails
{
public class PurchaseDetailsGetListOutput: EntityDto<long>
{
public string MaterialName { get; set; }
public string MaterialUnit { get; set; }
public float UnitPrice { get; set; }
public long TotalNumber { get; set; }
public string MaterialName { get; set; }=string.Empty;
public string MaterialUnit { get; set; }=string.Empty ;
public float UnitPrice { get; set; }
public long TotalNumber { get; set; }
public long CompleteNumber { get; set; }
public string Remarks { get; set; }
public string? Remarks { get; set; }
}
}

19
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Supplier/SupplierGetListInput.cs Normal file
View File

@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Model.Base;
namespace Yi.Framework.DtoModel.ERP.Supplier
{
public class SupplierGetListInput
{
public string Code { get; set; } = string.Empty;
public string Name { get; set; }= string.Empty;
public string? Address { get; set; }
public long? Phone { get; set; }
public string? Fax { get; set; }
public string? Email { get; set; }
}
}

4
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Unit/UnitCreateUpdateInput.cs
View File

@@ -10,8 +10,8 @@ namespace Yi.Framework.DtoModel.ERP.Unit
{
public class UnitCreateUpdateInput : EntityDto<long>
{
public string? Code { get; set; }
public string? Name { get; set; }
public string Code { get; set; }=string.Empty;
public string Name { get; set; }=string.Empty;
public string? Remarks { get; set; }
}
}

16
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Unit/UnitGetListInput.cs Normal file
View File

@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Model.Base;
namespace Yi.Framework.DtoModel.ERP.Unit
{
public class UnitGetListInput
{
public string Code { get; set; }=string.Empty;
public string Name { get; set; }=string.Empty;
public string? Remarks { get; set; }
}
}

6
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Unit/UnitGetListOutput.cs
View File

@@ -9,8 +9,8 @@ namespace Yi.Framework.DtoModel.ERP.Unit
{
public class UnitGetListOutput: EntityDto<long>
{
public string Code { get; set; }
public string Name { get; set; }
public string Remarks { get; set; }
public string Code { get; set; }=string.Empty;
public string Name { get; set; }=string.Empty;
public string? Remarks { get; set; }
}
}

6
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Warehouse/WarehouseCreateUpdateInput.cs
View File

@@ -11,9 +11,9 @@ namespace Yi.Framework.DtoModel.ERP.Warehouse
{
public class WarehouseCreateUpdateInput : EntityDto<long>
{
public string? Code { get; set; }
public string? Name { get; set; }
public string Code { get; set; }=string.Empty;
public string Name { get; set; }=string.Empty ;
public string? Remarks { get; set; }
public StateEnum? State { get; set; }
public StateEnum State { get; set; } = StateEnum.Normal;
}
}

18
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Warehouse/WarehouseGetListInput.cs Normal file
View File

@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Common.Enum;
using Yi.Framework.Model.Base;
namespace Yi.Framework.DtoModel.ERP.Warehouse
{
public class WarehouseGetListInput
{
public string Code { get; set; }=string.Empty;
public string Name { get; set; }=string.Empty ;
public string? Remarks { get; set; }
public StateEnum State { get; set; } = StateEnum.Normal;
}
}

8
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Warehouse/WarehouseGetListOutput.cs
View File

@@ -10,9 +10,9 @@ namespace Yi.Framework.DtoModel.ERP.Warehouse
{
public class WarehouseGetListOutput: EntityDto<long>
{
public string Code { get; set; }
public string Name { get; set; }
public string Remarks { get; set; }
public StateEnum State { get; set; }
public string Code { get; set; }=string.Empty;
public string Name { get; set; }=string.Empty ;
public string? Remarks { get; set; }
public StateEnum State { get; set; } = StateEnum.Normal;
}
}

22
Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/MapperConfig/StudentProfile.cs
View File

@@ -1,22 +0,0 @@
using AutoMapper;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Model.RABC.Entitys;
namespace Yi.Framework.DtoModel.RABC.Student.MapperConfig
{
public class StudentProfile : Profile
{
public StudentProfile()
{
CreateMap<StudentCreateInput, StudentEntity>();
CreateMap<StudentUpdateInput, StudentEntity>();
CreateMap<StudentCreateUpdateInput, StudentEntity>();
CreateMap<StudentEntity, StudentGetOutput>();
CreateMap<StudentEntity, StudentListOutput>();
}
}
}

13
Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentCreateInput.cs
View File

@@ -1,13 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Yi.Framework.DtoModel.RABC.Student
{
public class StudentCreateInput
{
public string Name { get; set; }
public string Remark { get; set; }
}
}

13
Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentCreateUpdateInput.cs
View File

@@ -1,13 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Yi.Framework.DtoModel.RABC.Student
{
public class StudentCreateUpdateInput
{
public string Name { get; set; }
public string Remark { get; set; }
}
}

14
Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentGetOutput.cs
View File

@@ -1,14 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Yi.Framework.Model.Base;
namespace Yi.Framework.DtoModel.RABC.Student
{
public class StudentGetOutput : EntityDto<Guid>
{
public string Name { get; set; }
public string Remark { get; set; }
}
}

14
Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentListOutput.cs
View File

@@ -1,14 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Yi.Framework.Model.Base;
namespace Yi.Framework.DtoModel.RABC.Student
{
public class StudentListOutput : EntityDto<Guid>
{
public string Name { get; set; }
public string Remark { get; set; }
}
}

13
Yi.Framework.Net6/Yi.Framework.DTOModel/RABC/Student/StudentUpdateInput.cs
View File

@@ -1,13 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Yi.Framework.DtoModel.RABC.Student
{
public class StudentUpdateInput
{
public string Name { get; set; }
public string Remark { get; set; }
}
}

1
Yi.Framework.Net6/Yi.Framework.DTOModel/Yi.Framework.DTOModel.csproj
View File

@@ -7,6 +7,7 @@
<ItemGroup>
<Folder Include="BBS\" />
<Folder Include="RABC\" />
<Folder Include="Shop\" />
</ItemGroup>

4
Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseUpdateInput.cs
View File

@@ -11,9 +11,9 @@ namespace Yi.Framework.DtoModel.ERP.Purchase
{
public class PurchaseUpdateInput : EntityDto<long>
{
public string Code { get; set; }
public string? Code { get; set; }
public DateTime NeedTime { get; set; }
public string Buyer { get; set; }
public string? Buyer { get; set; }
public long TotalMoney { get; set; }
public long PaidMoney { get; set; }
public PurchaseStateEnum PurchaseState { get; set; }

27
Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Supplier/SupplierCreateUpdateInput.cs
View File

@@ -1,4 +1,4 @@
using SqlSugar;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -10,32 +10,11 @@ namespace Yi.Framework.DtoModel.ERP.Supplier
{
public class SupplierCreateUpdateInput : EntityDto<long>
{
/// <summary>
/// 供应商编码
/// </summary>
public string? Code { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
public string? Name { get; set; }
/// <summary>
/// 供应商地址
/// </summary>
public string Code { get; set; } = string.Empty;
public string Name { get; set; }= string.Empty;
public string? Address { get; set; }
/// <summary>
/// 电话
/// </summary>
public long? Phone { get; set; }
/// <summary>
/// 传真
/// </summary>
public string? Fax { get; set; }
/// <summary>
/// 邮箱
/// </summary>
public string? Email { get; set; }
}
}

35
Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Supplier/SupplierGetListOutput.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -9,32 +9,11 @@ namespace Yi.Framework.DtoModel.ERP.Supplier
{
public class SupplierGetListOutput: EntityDto<long>
{
/// <summary>
/// 供应商编码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
public string Name { get; set; }
/// <summary>
/// 供应商地址
/// </summary>
public string Address { get; set; }
/// <summary>
/// 电话
/// </summary>
public long Phone { get; set; }
/// <summary>
/// 传真
/// </summary>
public string Fax { get; set; }
/// <summary>
/// 邮箱
/// </summary>
public string Email { get; set; }
public string Code { get; set; } = string.Empty;
public string Name { get; set; }= string.Empty;
public string? Address { get; set; }
public long? Phone { get; set; }
public string? Fax { get; set; }
public string? Email { get; set; }
}
}

14
Yi.Framework.Net6/Yi.Framework.DtoModel/RABC/Student/ConstConfig/StudentConst.cs
View File

@@ -1,14 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Yi.Framework.DtoModel.RABC.Student.ConstConfig
{
public class StudentConst
{
public const string 学生异常错误 = nameof(学生异常错误);
public const string 学生友好错误 = nameof(学生友好错误)+"，状态码将返回200";
}
}

13
Yi.Framework.Net6/Yi.Framework.Interface/RABC/IStudentService.cs
View File

@@ -1,13 +0,0 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Yi.Framework.DtoModel.RABC.Student;
using Yi.Framework.Interface.Base.Crud;
namespace Yi.Framework.Interface.RABC
{
public interface IStudentService : ICrudAppService<StudentGetOutput, StudentListOutput, Guid, StudentCreateInput, StudentUpdateInput>
{
void GetError();
}
}

20
Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/StudentEntity.cs
View File

@@ -1,20 +0,0 @@
using SqlSugar;
using System;
using Yi.Framework.Model.Base;
namespace Yi.Framework.Model.RABC.Entitys
{
[SugarTable("Student")]
public class StudentEntity : IEntity<Guid>, IMultiTenant
{
public string? Name { get; set; }
public string? Remark { get; set; }
[SugarColumn(ColumnName = "Id", IsPrimaryKey = true)]
public Guid Id { get; set; }
[SugarColumn(ColumnName = "TenantId")]
public Guid? TenantId { get; set; }
}
}

379
Yi.Framework.Net6/Yi.Framework.Model/RABC/SeedData/MenuSeed.cs
View File

@@ -100,13 +100,13 @@ namespace Yi.Framework.Model.RABC.SeedData
Entitys.Add(swagger);
//业务功能
MenuEntity business = new MenuEntity()
//BBS
MenuEntity bbs = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "业务功能",
MenuName = "BBS",
MenuType = MenuTypeEnum.Catalogue.GetHashCode(),
Router = "/business",
Router = "/bbs",
IsShow = true,
IsLink = false,
MenuIcon = "international",
@@ -114,22 +114,22 @@ namespace Yi.Framework.Model.RABC.SeedData
ParentId = 0,
IsDeleted = false
};
Entitys.Add(business);
Entitys.Add(bbs);
//文章管理
MenuEntity article = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "文章管理",
PermissionCode = "business:article:list",
PermissionCode = "bbs:article:list",
MenuType = MenuTypeEnum.Menu.GetHashCode(),
Router = "article",
IsShow = true,
IsLink = false,
IsCache = true,
Component = "business/article/index",
Component = "bbs/article/index",
MenuIcon = "education",
OrderNum = 100,
ParentId = business.Id,
ParentId = bbs.Id,
IsDeleted = false
};
Entitys.Add(article);
@@ -138,7 +138,7 @@ namespace Yi.Framework.Model.RABC.SeedData
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "文章查询",
PermissionCode = "business:article:query",
PermissionCode = "bbs:article:query",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = article.Id,
@@ -150,7 +150,7 @@ namespace Yi.Framework.Model.RABC.SeedData
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "文章新增",
PermissionCode = "business:article:add",
PermissionCode = "bbs:article:add",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = article.Id,
@@ -162,7 +162,7 @@ namespace Yi.Framework.Model.RABC.SeedData
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "文章修改",
PermissionCode = "business:article:edit",
PermissionCode = "bbs:article:edit",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = article.Id,
@@ -174,7 +174,7 @@ namespace Yi.Framework.Model.RABC.SeedData
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "文章删除",
PermissionCode = "business:article:remove",
PermissionCode = "bbs:article:remove",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = article.Id,
@@ -182,9 +182,364 @@ namespace Yi.Framework.Model.RABC.SeedData
};
Entitys.Add(articleRemove);
//ERP
MenuEntity erp = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "ERP",
MenuType = MenuTypeEnum.Catalogue.GetHashCode(),
Router = "/erp",
IsShow = true,
IsLink = false,
MenuIcon = "international",
OrderNum = 96,
ParentId = 0,
IsDeleted = false
};
Entitys.Add(erp);
//供应商定义
MenuEntity supplier = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "供应商定义",
PermissionCode = "erp:supplier:list",
MenuType = MenuTypeEnum.Menu.GetHashCode(),
Router = "supplier",
IsShow = true,
IsLink = false,
IsCache = true,
Component = "erp/supplier/index",
MenuIcon = "education",
OrderNum = 100,
ParentId = erp.Id,
IsDeleted = false
};
Entitys.Add(supplier);
MenuEntity supplierQuery = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "供应商查询",
PermissionCode = "erp:supplier:query",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = supplier.Id,
IsDeleted = false
};
Entitys.Add(supplierQuery);
MenuEntity supplierAdd = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "供应商新增",
PermissionCode = "erp:supplier:add",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = supplier.Id,
IsDeleted = false
};
Entitys.Add(supplierAdd);
MenuEntity supplierEdit = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "供应商修改",
PermissionCode = "erp:supplier:edit",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = supplier.Id,
IsDeleted = false
};
Entitys.Add(supplierEdit);
MenuEntity supplierRemove = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "供应商删除",
PermissionCode = "erp:supplier:remove",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = supplier.Id,
IsDeleted = false
};
Entitys.Add(supplierRemove);
//仓库定义
MenuEntity warehouse = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "仓库定义",
PermissionCode = "erp:warehouse:list",
MenuType = MenuTypeEnum.Menu.GetHashCode(),
Router = "warehouse",
IsShow = true,
IsLink = false,
IsCache = true,
Component = "erp/warehouse/index",
MenuIcon = "education",
OrderNum = 100,
ParentId = erp.Id,
IsDeleted = false
};
Entitys.Add(warehouse);
MenuEntity warehouseQuery = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "仓库查询",
PermissionCode = "erp:warehouse:query",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = warehouse.Id,
IsDeleted = false
};
Entitys.Add(warehouseQuery);
MenuEntity warehouseAdd = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "仓库新增",
PermissionCode = "erp:warehouse:add",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = warehouse.Id,
IsDeleted = false
};
Entitys.Add(warehouseAdd);
MenuEntity warehouseEdit = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "仓库修改",
PermissionCode = "erp:warehouse:edit",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = warehouse.Id,
IsDeleted = false
};
Entitys.Add(warehouseEdit);
MenuEntity warehouseRemove = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "仓库删除",
PermissionCode = "erp:warehouse:remove",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = warehouse.Id,
IsDeleted = false
};
Entitys.Add(warehouseRemove);
//单位定义
MenuEntity unit = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "单位定义",
PermissionCode = "erp:unit:list",
MenuType = MenuTypeEnum.Menu.GetHashCode(),
Router = "unit",
IsShow = true,
IsLink = false,
IsCache = true,
Component = "erp/unit/index",
MenuIcon = "education",
OrderNum = 100,
ParentId = erp.Id,
IsDeleted = false
};
Entitys.Add(unit);
MenuEntity unitQuery = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "单位查询",
PermissionCode = "erp:unit:query",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = unit.Id,
IsDeleted = false
};
Entitys.Add(unitQuery);
MenuEntity unitAdd = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "单位新增",
PermissionCode = "erp:unit:add",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = unit.Id,
IsDeleted = false
};
Entitys.Add(unitAdd);
MenuEntity unitEdit = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "单位修改",
PermissionCode = "erp:unit:edit",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = unit.Id,
IsDeleted = false
};
Entitys.Add(unitEdit);
MenuEntity unitRemove = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "单位删除",
PermissionCode = "erp:unit:remove",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = unit.Id,
IsDeleted = false
};
Entitys.Add(unitRemove);
//物料定义
MenuEntity material = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "物料定义",
PermissionCode = "erp:material:list",
MenuType = MenuTypeEnum.Menu.GetHashCode(),
Router = "material",
IsShow = true,
IsLink = false,
IsCache = true,
Component = "erp/material/index",
MenuIcon = "education",
OrderNum = 100,
ParentId = erp.Id,
IsDeleted = false
};
Entitys.Add(material);
MenuEntity materialQuery = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "物料查询",
PermissionCode = "erp:material:query",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = material.Id,
IsDeleted = false
};
Entitys.Add(materialQuery);
MenuEntity materialAdd = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "物料新增",
PermissionCode = "erp:material:add",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = material.Id,
IsDeleted = false
};
Entitys.Add(materialAdd);
MenuEntity materialEdit = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "物料修改",
PermissionCode = "erp:material:edit",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = material.Id,
IsDeleted = false
};
Entitys.Add(materialEdit);
MenuEntity materialRemove = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "物料删除",
PermissionCode = "erp:material:remove",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = material.Id,
IsDeleted = false
};
Entitys.Add(materialRemove);
//采购订单
MenuEntity purchase = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "采购订单",
PermissionCode = "erp:purchase:list",
MenuType = MenuTypeEnum.Menu.GetHashCode(),
Router = "purchase",
IsShow = true,
IsLink = false,
IsCache = true,
Component = "erp/purchase/index",
MenuIcon = "education",
OrderNum = 100,
ParentId = erp.Id,
IsDeleted = false
};
Entitys.Add(purchase);
MenuEntity purchaseQuery = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "采购订单查询",
PermissionCode = "erp:purchase:query",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = purchase.Id,
IsDeleted = false
};
Entitys.Add(purchaseQuery);
MenuEntity purchaseAdd = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "采购订单新增",
PermissionCode = "erp:purchase:add",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = purchase.Id,
IsDeleted = false
};
Entitys.Add(purchaseAdd);
MenuEntity purchaseEdit = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "采购订单修改",
PermissionCode = "erp:purchase:edit",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = purchase.Id,
IsDeleted = false
};
Entitys.Add(purchaseEdit);
MenuEntity purchaseRemove = new MenuEntity()
{
Id = SnowFlakeSingle.Instance.NextId(),
MenuName = "采购订单删除",
PermissionCode = "erp:purchase:remove",
MenuType = MenuTypeEnum.Component.GetHashCode(),
OrderNum = 100,
ParentId = purchase.Id,
IsDeleted = false
};
Entitys.Add(purchaseRemove);
//Yi框架
MenuEntity guide = new MenuEntity()

47
Yi.Framework.Net6/Yi.Framework.Service/RABC/StudentService.cs
View File

@@ -1,47 +0,0 @@
using AutoMapper;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Yi.Framework.Common.Exceptions;
using Yi.Framework.DtoModel.RABC.Student;
using Yi.Framework.DtoModel.RABC.Student.ConstConfig;
using Yi.Framework.Interface.RABC;
using Yi.Framework.Model.RABC.Entitys;
using Yi.Framework.Repository;
using Yi.Framework.Service.Base.Crud;
namespace Yi.Framework.Service.RABC
{
public class StudentService : CrudAppService<StudentEntity, StudentGetOutput, StudentListOutput, Guid, StudentCreateInput, StudentUpdateInput>, IStudentService
{
public void GetError()
{
throw new ApplicationException(StudentConst.学生异常错误);
}
public void GetError2()
{
throw new UserFriendlyException(StudentConst.学生友好错误);
}
/// <summary>
/// 校验配置项是否已存在
/// </summary>
/// <param name="key"></param>
/// <param name="id"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
//private async Task ValidateKeyAsync(string key, Guid? id = null)
//{
// Expression<Func<StudentEntity, bool>> expression = e => e.Name == key;
// if (id.HasValue)
// {
// expression = expression.And(e => e.Id != id.Value);
// }
// var existsData = await Repository.GetListAsync(expression);
// if (existsData != null)
// {
// throw new UserFriendlyException();
// }
//}
}
}

2
Yi.Framework.Net6/Yi.Framework.Template/Abstract/ModelTemplateProvider.cs
View File

@@ -15,7 +15,7 @@ namespace Yi.Framework.Template.Abstract
AddIgnoreEntityField("Id", "TenantId");
}
private string entityPath;
private string entityPath=string.Empty;
/// <summary>
/// 实体路径，该类生成需要实体与模板两个同时构建成

1
Yi.Framework.Net6/Yi.Framework.WebCore/AspNetCoreExtensions/AutoMapperExtension.cs
View File

@@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.IO;
using Yi.Framework.DtoModel.RABC.Student.MapperConfig;
using Yi.Framework.WebCore.Mapper;
namespace Yi.Framework.WebCore.AspNetCoreExtensions