From bcf39d525be24c83c1a2ec798dbdf898b1f7098f Mon Sep 17 00:00:00 2001 From: lzw <605106923@qq.com> Date: Tue, 12 Oct 2021 12:50:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Yi.Framework.ApiMicroservice/Startup.cs | 17 ++++---- .../ILoopModelService.cs | 18 ++++++++ .../Yi.Framework.Interface/IMenuService.cs | 18 ++++++++ .../Yi.Framework.Interface/IMouldService.cs | 18 ++++++++ .../Yi.Framework.Interface/IRoleService.cs | 3 ++ .../Yi.Framework.Interface/IUserService.cs | 6 ++- .../Yi.Framework.Model/Models/menu.cs | 5 +-- .../Yi.Framework.Model/Models/role.cs | 2 - .../Yi.Framework.Model/Models/user.cs | 1 - .../Yi.Framework.Service/LoopModelService.cs | 41 ++++++++++++++++++ .../Yi.Framework.Service/MenuService.cs | 42 +++++++++++++++++++ .../Yi.Framework.Service/MouldService.cs | 42 +++++++++++++++++++ .../Yi.Framework.Service/RoleService.cs | 21 ++++++++-- .../Yi.Framework.Service/UserService.cs | 19 ++++++++- 14 files changed, 232 insertions(+), 21 deletions(-) create mode 100644 Yi.Framework/Yi.Framework.Interface/ILoopModelService.cs create mode 100644 Yi.Framework/Yi.Framework.Interface/IMenuService.cs create mode 100644 Yi.Framework/Yi.Framework.Interface/IMouldService.cs create mode 100644 Yi.Framework/Yi.Framework.Service/LoopModelService.cs create mode 100644 Yi.Framework/Yi.Framework.Service/MenuService.cs create mode 100644 Yi.Framework/Yi.Framework.Service/MouldService.cs diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Startup.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Startup.cs index 2a27d34a..b73232b6 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Startup.cs +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Startup.cs @@ -35,13 +35,13 @@ namespace Yi.Framework.ApiMicroservice services.AddControllers(); services.AddCors(options => options.AddPolicy("CorsPolicy",//½â¾ö¿çÓòÎÊÌâ -builder => -{ - builder.AllowAnyMethod() - .SetIsOriginAllowed(_ => true) - .AllowAnyHeader() - .AllowCredentials(); -})); + builder => + { + builder.AllowAnyMethod() + .SetIsOriginAllowed(_ => true) + .AllowAnyHeader() + .AllowCredentials(); + })); services.Configure(this.Configuration.GetSection("SqliteConn")); services.AddScoped(); @@ -49,6 +49,9 @@ builder => services.AddScoped(); services.AddScoped(); + services.AddScoped(); + services.AddScoped(); + services.AddScoped(); services.AddSwaggerGen(c => { diff --git a/Yi.Framework/Yi.Framework.Interface/ILoopModelService.cs b/Yi.Framework/Yi.Framework.Interface/ILoopModelService.cs new file mode 100644 index 00000000..7e50485e --- /dev/null +++ b/Yi.Framework/Yi.Framework.Interface/ILoopModelService.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Model.Models; + +namespace Yi.Framework.Interface +{ + public interface ILoopModelService:IBaseService + { + Task DelListByUpdateAsync(List _ids); + Task> GetAllEntitiesTrueAsync(); + Task> GetEntitiesTrueByIdAsync(List _ids); + Task AddEntitesAsync(List _loopModels); + Task UpdateEntitesAsync(List _loopModels); + } +} diff --git a/Yi.Framework/Yi.Framework.Interface/IMenuService.cs b/Yi.Framework/Yi.Framework.Interface/IMenuService.cs new file mode 100644 index 00000000..ba359fab --- /dev/null +++ b/Yi.Framework/Yi.Framework.Interface/IMenuService.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Model.Models; + +namespace Yi.Framework.Interface +{ + public interface IMenuService:IBaseService + { + Task DelListByUpdateAsync(List _ids); + Task> GetAllEntitiesTrueAsync(); + Task> GetEntitiesTrueByIdAsync(List _ids); + Task AddEntitesAsync(List _menus); + Task UpdateEntitesAsync(List _menus); + } +} diff --git a/Yi.Framework/Yi.Framework.Interface/IMouldService.cs b/Yi.Framework/Yi.Framework.Interface/IMouldService.cs new file mode 100644 index 00000000..9f4f7c1a --- /dev/null +++ b/Yi.Framework/Yi.Framework.Interface/IMouldService.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Model.Models; + +namespace Yi.Framework.Interface +{ + public interface IMouldService:IBaseService + { + Task DelListByUpdateAsync(List _ids); + Task> GetAllEntitiesTrueAsync(); + Task> GetEntitiesTrueByIdAsync(List _ids); + Task AddEntitesAsync(List _moulds); + Task UpdateEntitesAsync(List _moulds); + } +} diff --git a/Yi.Framework/Yi.Framework.Interface/IRoleService.cs b/Yi.Framework/Yi.Framework.Interface/IRoleService.cs index 44ed4b0a..f3d45e1b 100644 --- a/Yi.Framework/Yi.Framework.Interface/IRoleService.cs +++ b/Yi.Framework/Yi.Framework.Interface/IRoleService.cs @@ -11,5 +11,8 @@ namespace Yi.Framework.Interface { Task DelListByUpdateAsync(List _ids); Task> GetAllEntitiesTrueAsync(); + Task> GetEntitiesTrueByIdAsync(List _ids); + Task AddEntitesAsync(List _roles); + Task UpdateEntitesAsync(List _roles); } } diff --git a/Yi.Framework/Yi.Framework.Interface/IUserService.cs b/Yi.Framework/Yi.Framework.Interface/IUserService.cs index d39e75d5..d99c4054 100644 --- a/Yi.Framework/Yi.Framework.Interface/IUserService.cs +++ b/Yi.Framework/Yi.Framework.Interface/IUserService.cs @@ -10,6 +10,10 @@ namespace Yi.Framework.Interface public interface IUserService:IBaseService { Task DelListByUpdateAsync(List _ids); - Task> GetAllEntitiesTrueAsync(); + Task> GetAllEntitiesTrueAsync(); + Task> GetEntitiesTrueByIdAsync(List _ids); + Task AddEntitesAsync(List _users); + Task UpdateEntitesAsync(List _users); + } } diff --git a/Yi.Framework/Yi.Framework.Model/Models/menu.cs b/Yi.Framework/Yi.Framework.Model/Models/menu.cs index dfab5c4c..ec10c04c 100644 --- a/Yi.Framework/Yi.Framework.Model/Models/menu.cs +++ b/Yi.Framework/Yi.Framework.Model/Models/menu.cs @@ -10,10 +10,7 @@ namespace Yi.Framework.Model.Models { public string icon { get; set; } public string router { get; set; } - public string menu_name { get; set; } - - - + public string menu_name { get; set; } public ICollection children { get; set; } public mould mould { get; set; } public ICollection roles { get; set; } diff --git a/Yi.Framework/Yi.Framework.Model/Models/role.cs b/Yi.Framework/Yi.Framework.Model/Models/role.cs index e071074b..bdb3ed14 100644 --- a/Yi.Framework/Yi.Framework.Model/Models/role.cs +++ b/Yi.Framework/Yi.Framework.Model/Models/role.cs @@ -10,8 +10,6 @@ namespace Yi.Framework.Model.Models { public string role_name { get; set; } public string introduce { get; set; } - - public ICollection menus { get; set; } public ICollection users { get; set; } } diff --git a/Yi.Framework/Yi.Framework.Model/Models/user.cs b/Yi.Framework/Yi.Framework.Model/Models/user.cs index 13237cad..3ca86b17 100644 --- a/Yi.Framework/Yi.Framework.Model/Models/user.cs +++ b/Yi.Framework/Yi.Framework.Model/Models/user.cs @@ -17,7 +17,6 @@ namespace Yi.Framework.Model.Models public string ip { get; set; } public int? age { get; set; } public string introduction { get; set; } - public ICollection roles { get; set; } } diff --git a/Yi.Framework/Yi.Framework.Service/LoopModelService.cs b/Yi.Framework/Yi.Framework.Service/LoopModelService.cs new file mode 100644 index 00000000..ce4a78d9 --- /dev/null +++ b/Yi.Framework/Yi.Framework.Service/LoopModelService.cs @@ -0,0 +1,41 @@ +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Interface; +using Yi.Framework.Model.Models; + +namespace Yi.Framework.Service +{ + public class LoopModelService:BaseService, ILoopModelService + { + public LoopModelService(DbContext Db) : base(Db) + { + } + public async Task DelListByUpdateAsync(List _ids) + { + var loopModelList = await GetEntitiesAsync(u => _ids.Contains(u.id)); + loopModelList.ToList().ForEach(u => u.is_delete = (short)Common.Enum.DelFlagEnum.Deleted); + return await UpdateListAsync(loopModelList); + } + public async Task> GetAllEntitiesTrueAsync() + { + return await GetEntitiesAsync(u => u.is_delete == (short)Common.Enum.DelFlagEnum.Normal); + } + public async Task AddEntitesAsync(List _loopModels) + { + _loopModels.ToList().ForEach(u => u.is_delete = (short)Common.Enum.DelFlagEnum.Normal); + return await AddEntitesAsync(_loopModels); + } + public async Task> GetEntitiesTrueByIdAsync(List _ids) + { + return await GetEntitiesAsync(u => _ids.Contains(u.id)); + } + public async Task UpdateEntitesAsync(List _loopModels) + { + return await UpdateEntitesAsync(_loopModels); + } + } +} diff --git a/Yi.Framework/Yi.Framework.Service/MenuService.cs b/Yi.Framework/Yi.Framework.Service/MenuService.cs new file mode 100644 index 00000000..ea540039 --- /dev/null +++ b/Yi.Framework/Yi.Framework.Service/MenuService.cs @@ -0,0 +1,42 @@ +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Interface; +using Yi.Framework.Model.Models; + +namespace Yi.Framework.Service +{ + public class MenuService:BaseService, IMenuService + { + public MenuService(DbContext Db):base(Db) + { + + } + public async Task DelListByUpdateAsync(List _ids) + { + var menuList = await GetEntitiesAsync(u => _ids.Contains(u.id)); + menuList.ToList().ForEach(u => u.is_delete = (short)Common.Enum.DelFlagEnum.Deleted); + return await UpdateListAsync(menuList); + } + public async Task> GetAllEntitiesTrueAsync() + { + return await GetEntitiesAsync(u => u.is_delete == (short)Common.Enum.DelFlagEnum.Normal); + } + public async Task AddEntitesAsync(List _menus) + { + _menus.ToList().ForEach(u => u.is_delete = (short)Common.Enum.DelFlagEnum.Normal); + return await AddEntitesAsync(_menus); + } + public async Task> GetEntitiesTrueByIdAsync(List _ids) + { + return await GetEntitiesAsync(u => _ids.Contains(u.id)); + } + public async Task UpdateEntitesAsync(List _menus) + { + return await UpdateEntitesAsync(_menus); + } + } +} diff --git a/Yi.Framework/Yi.Framework.Service/MouldService.cs b/Yi.Framework/Yi.Framework.Service/MouldService.cs new file mode 100644 index 00000000..0f0c6029 --- /dev/null +++ b/Yi.Framework/Yi.Framework.Service/MouldService.cs @@ -0,0 +1,42 @@ +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Interface; +using Yi.Framework.Model.Models; + +namespace Yi.Framework.Service +{ + public class MouldService:BaseService, IMouldService + { + public MouldService(DbContext Db) : base(Db) + { + + } + public async Task DelListByUpdateAsync(List _ids) + { + var mouldList = await GetEntitiesAsync(u => _ids.Contains(u.id)); + mouldList.ToList().ForEach(u => u.is_delete = (short)Common.Enum.DelFlagEnum.Deleted); + return await UpdateListAsync(mouldList); + } + public async Task> GetAllEntitiesTrueAsync() + { + return await GetEntitiesAsync(u => u.is_delete == (short)Common.Enum.DelFlagEnum.Normal); + } + public async Task AddEntitesAsync(List _moulds) + { + _moulds.ToList().ForEach(u => u.is_delete = (short)Common.Enum.DelFlagEnum.Normal); + return await AddEntitesAsync(_moulds); + } + public async Task> GetEntitiesTrueByIdAsync(List _ids) + { + return await GetEntitiesAsync(u => _ids.Contains(u.id)); + } + public async Task UpdateEntitesAsync(List _moulds) + { + return await UpdateEntitesAsync(_moulds); + } + } +} diff --git a/Yi.Framework/Yi.Framework.Service/RoleService.cs b/Yi.Framework/Yi.Framework.Service/RoleService.cs index 5c3dd6b7..eb80276b 100644 --- a/Yi.Framework/Yi.Framework.Service/RoleService.cs +++ b/Yi.Framework/Yi.Framework.Service/RoleService.cs @@ -17,13 +17,26 @@ namespace Yi.Framework.Service public async Task DelListByUpdateAsync(List _ids) { - var userList = await GetEntitiesAsync(u=>_ids.Contains(u.id)); - userList.ToList().ForEach(u => u.is_delete =(short)Common.Enum.DelFlagEnum.Deleted); - return await UpdateListAsync(userList); + var roleList = await GetEntitiesAsync(u=>_ids.Contains(u.id)); + roleList.ToList().ForEach(u => u.is_delete =(short)Common.Enum.DelFlagEnum.Deleted); + return await UpdateListAsync(roleList); } public async Task> GetAllEntitiesTrueAsync() { - return await _Db.Set().Where(u => u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); + return await GetEntitiesAsync(u => u.is_delete == (short)Common.Enum.DelFlagEnum.Normal); + } + public async Task AddEntitesAsync(List _roles) + { + _roles.ToList().ForEach(u => u.is_delete = (short)Common.Enum.DelFlagEnum.Normal); + return await AddEntitesAsync(_roles); + } + public async Task> GetEntitiesTrueByIdAsync(List _ids) + { + return await GetEntitiesAsync(u => _ids.Contains(u.id)); + } + public async Task UpdateEntitesAsync(List _roles) + { + return await UpdateEntitesAsync(_roles); } } } diff --git a/Yi.Framework/Yi.Framework.Service/UserService.cs b/Yi.Framework/Yi.Framework.Service/UserService.cs index bb56006d..b1c205d7 100644 --- a/Yi.Framework/Yi.Framework.Service/UserService.cs +++ b/Yi.Framework/Yi.Framework.Service/UserService.cs @@ -15,16 +15,31 @@ namespace Yi.Framework.Service public UserService(DbContext Db):base(Db) { } + public async Task DelListByUpdateAsync(List _ids) { var userList = await GetEntitiesAsync(u => _ids.Contains(u.id)); userList.ToList().ForEach(u => u.is_delete = (short)Common.Enum.DelFlagEnum.Deleted); return await UpdateListAsync(userList); } - public async Task> GetAllEntitiesTrueAsync() { - return await _Db.Set().Where(u=>u.is_delete==(short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); + return await GetEntitiesAsync(u=>u.is_delete==(short)Common.Enum.DelFlagEnum.Normal); } + public async Task AddEntitesAsync(List _users) + { + _users.ToList().ForEach(u => u.is_delete = (short)Common.Enum.DelFlagEnum.Normal); + return await AddEntitesAsync(_users); + } + public async Task> GetEntitiesTrueByIdAsync(List _ids) + { + return await GetEntitiesAsync(u => _ids.Contains(u.id)); + } + public async Task UpdateEntitesAsync(List _users) + { + return await UpdateEntitesAsync(_users); + } + + } }