From 7b283ab0caac8e4bebb8a51e0ebcb6a720d8b95b Mon Sep 17 00:00:00 2001 From: pangwenpeng <17302161021@163.com> Date: Thu, 30 May 2024 09:36:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=AF=94=E6=8F=90=E4=BA=A4=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E6=B2=A1=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- langguanApi/Controllers/MeauController.cs | 23 -------------- langguanApi/Controllers/RoleController.cs | 2 -- .../Dto/SystemConfigurationDto/MeauDto.cs | 30 ------------------- .../Dto/SystemConfigurationDto/RoleDto.cs | 25 ---------------- langguanApi/Model/Entity/UserEntity.cs | 2 -- langguanApi/Service/MeauService.cs | 23 -------------- langguanApi/Service/UserService.cs | 2 -- 7 files changed, 107 deletions(-) delete mode 100644 langguanApi/Controllers/MeauController.cs delete mode 100644 langguanApi/Model/Dto/SystemConfigurationDto/MeauDto.cs delete mode 100644 langguanApi/Model/Dto/SystemConfigurationDto/RoleDto.cs delete mode 100644 langguanApi/Service/MeauService.cs diff --git a/langguanApi/Controllers/MeauController.cs b/langguanApi/Controllers/MeauController.cs deleted file mode 100644 index 327413c..0000000 --- a/langguanApi/Controllers/MeauController.cs +++ /dev/null @@ -1,23 +0,0 @@ -using langguanApi.Model; -using langguanApi.Model.Dto.SystemConfigurationDto; -using langguanApi.Service; -using Microsoft.AspNetCore.Mvc; - -namespace langguanApi.Controllers -{ - /// - /// 菜单控制器 - /// - [Route("api/[controller]")] - [ApiController] - public class MeauController : ControllerBase - { - private MeauService _meuaService; - public MeauController(MeauService meauService) - { - _meuaService = meauService; - } - - - } -} diff --git a/langguanApi/Controllers/RoleController.cs b/langguanApi/Controllers/RoleController.cs index 1e3201c..2fdc7e1 100644 --- a/langguanApi/Controllers/RoleController.cs +++ b/langguanApi/Controllers/RoleController.cs @@ -1,10 +1,8 @@ using langguanApi.Model; using langguanApi.Model.Entity; -using langguanApi.Model.Dto.SystemConfigurationDto; using langguanApi.Service; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using System.Threading.Tasks; namespace langguanApi.Controllers { diff --git a/langguanApi/Model/Dto/SystemConfigurationDto/MeauDto.cs b/langguanApi/Model/Dto/SystemConfigurationDto/MeauDto.cs deleted file mode 100644 index 1f950d0..0000000 --- a/langguanApi/Model/Dto/SystemConfigurationDto/MeauDto.cs +++ /dev/null @@ -1,30 +0,0 @@ -namespace langguanApi.Model.Dto.SystemConfigurationDto -{ - public class MeauDto - { - /// - /// 父菜单ID 默认首页为1级,有组织为2级,无组织为2级,下面的子菜单为3级 - /// - public string ParentId { get; set; } - /// - /// 菜单编码 - /// - public string MenuCode { get; set; } - /// - /// 菜单名称 - /// - public string MenuName { get; set; } - /// - /// 可空,菜单跳转路径 - /// - public string Url { get; set; } - /// - /// 排序 - /// - public int Sort { get; set; } - /// - /// 是否激活 - /// - public bool IsActive { get; set; } - } -} diff --git a/langguanApi/Model/Dto/SystemConfigurationDto/RoleDto.cs b/langguanApi/Model/Dto/SystemConfigurationDto/RoleDto.cs deleted file mode 100644 index ba7dd96..0000000 --- a/langguanApi/Model/Dto/SystemConfigurationDto/RoleDto.cs +++ /dev/null @@ -1,25 +0,0 @@ -namespace langguanApi.Model.Dto.SystemConfigurationDto -{ - /// - /// 角色DTO - /// - public class RoleDto - { - /// - /// 角色名称 - /// - public string RoleName { get; set; } - /// - /// 多个菜单用,隔开 - /// - public string Meaus { get; set; } - /// - /// 是否管理员 - /// - public bool IsAdmin { get; set; } - /// - /// 角色描述 - /// - public string Description { get; set; } - } -} diff --git a/langguanApi/Model/Entity/UserEntity.cs b/langguanApi/Model/Entity/UserEntity.cs index d79a11f..68d5bb1 100644 --- a/langguanApi/Model/Entity/UserEntity.cs +++ b/langguanApi/Model/Entity/UserEntity.cs @@ -29,8 +29,6 @@ namespace langguanApi.Model.Entity /// public string Phone { get; set; } - //是否管理员 0表示不是管理员 1表示管理员 - public byte IsAdmin { get; set; } } /// /// 添加用户DTO diff --git a/langguanApi/Service/MeauService.cs b/langguanApi/Service/MeauService.cs deleted file mode 100644 index 9309988..0000000 --- a/langguanApi/Service/MeauService.cs +++ /dev/null @@ -1,23 +0,0 @@ -using langguanApi.Extensions.AutoDI; -using langguanApi.Model; -using langguanApi.Model.Dto.SystemConfigurationDto; -using langguanApi.Model.Entity; -using Mapster; -using System.Linq.Expressions; - -namespace langguanApi.Service -{ - /// - /// 菜单服务 - /// - [ServiceInjection(InjectionType.Transient)] - public class MeauService : BaseService - { - public MeauService(IConfiguration config) : base(config, nameof(Menu)) - { - } - - - - } -} diff --git a/langguanApi/Service/UserService.cs b/langguanApi/Service/UserService.cs index aefb0c5..fb143a5 100644 --- a/langguanApi/Service/UserService.cs +++ b/langguanApi/Service/UserService.cs @@ -203,7 +203,6 @@ namespace langguanApi.Service Email = item.Email, RoleId = item.RoleId, RoleName = roleList.FirstOrDefault(s => s.Id == item.RoleId)?.RoleName, - IsAdmin = item.IsAdmin == 0 ? "男" : "女", Tel = item.Phone, }); } @@ -261,7 +260,6 @@ namespace langguanApi.Service Email = user.Email, RoleId = user.RoleId, RoleName = role.RoleName, - IsAdmin = user.IsAdmin == 0 ? "男" : "女", Tel = user.Phone }; #endregion