From f35ca695500c6e59ad6bbdd67d98d28c23f93242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Tue, 12 Oct 2021 13:45:24 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=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 This reverts commit bcf39d525be24c83c1a2ec798dbdf898b1f7098f. --- .../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, 21 insertions(+), 232 deletions(-) delete mode 100644 Yi.Framework/Yi.Framework.Interface/ILoopModelService.cs delete mode 100644 Yi.Framework/Yi.Framework.Interface/IMenuService.cs delete mode 100644 Yi.Framework/Yi.Framework.Interface/IMouldService.cs delete mode 100644 Yi.Framework/Yi.Framework.Service/LoopModelService.cs delete mode 100644 Yi.Framework/Yi.Framework.Service/MenuService.cs delete 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 b73232b6..2a27d34a 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,9 +49,6 @@ namespace Yi.Framework.ApiMicroservice 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 deleted file mode 100644 index 7e50485e..00000000 --- a/Yi.Framework/Yi.Framework.Interface/ILoopModelService.cs +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index ba359fab..00000000 --- a/Yi.Framework/Yi.Framework.Interface/IMenuService.cs +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 9f4f7c1a..00000000 --- a/Yi.Framework/Yi.Framework.Interface/IMouldService.cs +++ /dev/null @@ -1,18 +0,0 @@ -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 f3d45e1b..44ed4b0a 100644 --- a/Yi.Framework/Yi.Framework.Interface/IRoleService.cs +++ b/Yi.Framework/Yi.Framework.Interface/IRoleService.cs @@ -11,8 +11,5 @@ 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 d99c4054..d39e75d5 100644 --- a/Yi.Framework/Yi.Framework.Interface/IUserService.cs +++ b/Yi.Framework/Yi.Framework.Interface/IUserService.cs @@ -10,10 +10,6 @@ namespace Yi.Framework.Interface public interface IUserService:IBaseService { Task DelListByUpdateAsync(List _ids); - Task> GetAllEntitiesTrueAsync(); - Task> GetEntitiesTrueByIdAsync(List _ids); - Task AddEntitesAsync(List _users); - Task UpdateEntitesAsync(List _users); - + Task> GetAllEntitiesTrueAsync(); } } diff --git a/Yi.Framework/Yi.Framework.Model/Models/menu.cs b/Yi.Framework/Yi.Framework.Model/Models/menu.cs index ec10c04c..dfab5c4c 100644 --- a/Yi.Framework/Yi.Framework.Model/Models/menu.cs +++ b/Yi.Framework/Yi.Framework.Model/Models/menu.cs @@ -10,7 +10,10 @@ 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 bdb3ed14..e071074b 100644 --- a/Yi.Framework/Yi.Framework.Model/Models/role.cs +++ b/Yi.Framework/Yi.Framework.Model/Models/role.cs @@ -10,6 +10,8 @@ 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 3ca86b17..13237cad 100644 --- a/Yi.Framework/Yi.Framework.Model/Models/user.cs +++ b/Yi.Framework/Yi.Framework.Model/Models/user.cs @@ -17,6 +17,7 @@ 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 deleted file mode 100644 index ce4a78d9..00000000 --- a/Yi.Framework/Yi.Framework.Service/LoopModelService.cs +++ /dev/null @@ -1,41 +0,0 @@ -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 deleted file mode 100644 index ea540039..00000000 --- a/Yi.Framework/Yi.Framework.Service/MenuService.cs +++ /dev/null @@ -1,42 +0,0 @@ -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 deleted file mode 100644 index 0f0c6029..00000000 --- a/Yi.Framework/Yi.Framework.Service/MouldService.cs +++ /dev/null @@ -1,42 +0,0 @@ -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 eb80276b..5c3dd6b7 100644 --- a/Yi.Framework/Yi.Framework.Service/RoleService.cs +++ b/Yi.Framework/Yi.Framework.Service/RoleService.cs @@ -17,26 +17,13 @@ namespace Yi.Framework.Service public async Task DelListByUpdateAsync(List _ids) { - 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); + 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 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); + return await _Db.Set().Where(u => u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); } } } diff --git a/Yi.Framework/Yi.Framework.Service/UserService.cs b/Yi.Framework/Yi.Framework.Service/UserService.cs index b1c205d7..bb56006d 100644 --- a/Yi.Framework/Yi.Framework.Service/UserService.cs +++ b/Yi.Framework/Yi.Framework.Service/UserService.cs @@ -15,31 +15,16 @@ 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 GetEntitiesAsync(u=>u.is_delete==(short)Common.Enum.DelFlagEnum.Normal); + return await _Db.Set().Where(u=>u.is_delete==(short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); } - 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); - } - - } }