yanghongwei
/
lg_backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

This commit is contained in:
yanghongwei 2024-05-30 22:48:04 +08:00
parent 1525e6df40
commit 6c9a566784
5 changed files with 234 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

221
langguanApi.xml
View File

@ -78,6 +78,20 @@
<param name="password"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Common.StringHelper.Encrypt(System.String)">
<summary>
加密
</summary>
<param name="strSource">需要加密的字符串</param>
<returns>加密后的字符串</returns>
</member>
<member name="M:langguanApi.Common.StringHelper.Decrypt(System.String)">
<summary>
解密
</summary>
<param name="Source">需要解密的字符串</param>
<returns>解密后的字符串</returns>
</member>
<member name="M:langguanApi.Controllers.DeviceController.#ctor(langguanApi.Service.DeviceService)">
<summary>
@ -197,7 +211,7 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.MenuController.Remove(System.Collections.Generic.IEnumerable{System.String})">
<member name="M:langguanApi.Controllers.MenuController.DeleteMenu(System.Collections.Generic.IEnumerable{System.String})">
<summary>
删除菜单
</summary>
@ -327,14 +341,41 @@
<param name="input"></param>
<returns></returns>
</member>
<!-- Badly formed XML comment ignored for member "M:langguanApi.Controllers.UserController.Delete(System.String)" -->
<member name="M:langguanApi.Controllers.UserController.Update(langguanApi.Model.Dto.UserUpdate)">
<member name="M:langguanApi.Controllers.UserController.AddUser(langguanApi.Model.Dto.SystemConfigurationDto.UserDto)">
<summary>
新增用户
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.UserController.GetUserList(langguanApi.Model.Dto.SystemConfigurationDto.UserQueryDto)">
<summary>
获取用户列表
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.UserController.GetUserById(System.String)">
<summary>
根据用户Id获取用户信息
</summary>
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.UserController.UpdateUser(langguanApi.Model.Dto.SystemConfigurationDto.UserDto)">
<summary>
修改用户信息
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.UserController.DeleteUser(System.String)">
<summary>
删除用户
</summary>
<param name="userId"></param>
<returns></returns>
</member>
<member name="T:langguanApi.Extensions.AutoDI.InjectionType">
<summary>
注入生命周期
@ -712,6 +753,101 @@
<param name="Text">原始数据</param>
<returns>是否通过</returns>
</member>
<member name="T:langguanApi.Model.Dto.SystemConfigurationDto.UserDto">
<summary>
用于用户管理的Dto
</summary>
</member>
<member name="P:langguanApi.Model.Dto.SystemConfigurationDto.UserDto.Id">
<summary>
用户ID
</summary>
</member>
<member name="P:langguanApi.Model.Dto.SystemConfigurationDto.UserDto.Username">
<summary>
用户名
</summary>
</member>
<member name="P:langguanApi.Model.Dto.SystemConfigurationDto.UserDto.RoleId">
<summary>
角色id
</summary>
</member>
<member name="P:langguanApi.Model.Dto.SystemConfigurationDto.UserDto.Email">
<summary>
邮箱
</summary>
</member>
<member name="P:langguanApi.Model.Dto.SystemConfigurationDto.UserDto.Tel">
<summary>
手机号
</summary>
</member>
<member name="P:langguanApi.Model.Dto.SystemConfigurationDto.UserDto.IsDel">
<summary>
是否删除 0否 1是
</summary>
</member>
<member name="P:langguanApi.Model.Dto.SystemConfigurationDto.UserDto.Password">
<summary>
密码 md5加密
</summary>
</member>
<member name="T:langguanApi.Model.Dto.SystemConfigurationDto.UserQueryDto">
<summary>
根据用户条件查询
</summary>
</member>
<member name="P:langguanApi.Model.Dto.SystemConfigurationDto.UserQueryDto.key">
<summary>
关键字查询，可根据userName,Tel,Email
</summary>
</member>
<member name="P:langguanApi.Model.Dto.SystemConfigurationDto.UserQueryDto.PageSize">
<summary>
当前条数
</summary>
</member>
<member name="P:langguanApi.Model.Dto.SystemConfigurationDto.UserQueryDto.PageIndex">
<summary>
当前页数
</summary>
</member>
<member name="T:langguanApi.Model.Dto.SystemConfigurationDto.UserDetailDto">
<summary>
用户列表展示
</summary>
</member>
<member name="P:langguanApi.Model.Dto.SystemConfigurationDto.UserDetailDto.UserId">
<summary>
用户ID，方便查看详情操作
</summary>
</member>
<member name="P:langguanApi.Model.Dto.SystemConfigurationDto.UserDetailDto.Username">
<summary>
用户名
</summary>
</member>
<member name="P:langguanApi.Model.Dto.SystemConfigurationDto.UserDetailDto.Email">
<summary>
邮箱
</summary>
</member>
<member name="P:langguanApi.Model.Dto.SystemConfigurationDto.UserDetailDto.RoleId">
<summary>
角色id
</summary>
</member>
<member name="P:langguanApi.Model.Dto.SystemConfigurationDto.UserDetailDto.RoleName">
<summary>
角色名称
</summary>
</member>
<member name="P:langguanApi.Model.Dto.SystemConfigurationDto.UserDetailDto.Tel">
<summary>
联系方式
</summary>
</member>
<member name="P:langguanApi.Model.Dto.UserAdd.Username">
<summary>
用户名
@ -819,7 +955,7 @@
</member>
<member name="P:langguanApi.Model.Entity.Menu.ParentId">
<summary>
父菜单ID，一级菜单为null
父菜单ID，一级菜单为"0"
</summary>
</member>
<member name="P:langguanApi.Model.Entity.AddMenuDto.Name">
@ -922,7 +1058,7 @@
密码 md5加密
</summary>
</member>
<member name="P:langguanApi.Model.Entity.UserEntity.roleId">
<member name="P:langguanApi.Model.Entity.UserEntity.RoleId">
<summary>
角色id
</summary>
@ -1792,6 +1928,20 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.MenuService.AddMenu(langguanApi.Model.Entity.AddMenuDto)">
<summary>
新增菜单
</summary>
<param name="menu">菜单实体</param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.MenuService.UpdateMenu(langguanApi.Model.Entity.UpdateMenuDto)">
<summary>
更改菜单
</summary>
<param name="menu">菜单实体类</param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.MenuService.GetMenuTree">
<summary>
获取菜单树
@ -1805,6 +1955,13 @@
<param name="parentId"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.MenuService.DeleteMenu(System.String)">
<summary>
作废菜单 (废弃，不做处理)
</summary>
<param name="id">当前菜单id</param>
<returns></returns>
</member>
<member name="T:langguanApi.Service.OrganizedService">
<summary>
OrganizedService
@ -1902,6 +2059,11 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="T:langguanApi.Service.RoleService">
<summary>
角色服务
</summary>
</member>
<member name="M:langguanApi.Service.RoleService.Add(langguanApi.Model.Entity.AddRoleDto)">
<summary>
新增角色
@ -1937,6 +2099,20 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.RoleService.GetRoleById(System.String)">
<summary>
根据id获取角色信息
</summary>
<param name="roleId"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.RoleService.GetRoleListByIds(System.Collections.Generic.IEnumerable{System.String})">
<summary>
根据Id,获取多个校色信息
</summary>
<param name="ids"></param>
<returns></returns>
</member>
<member name="T:langguanApi.Service.TransportService">
<summary>
TransportService 运输服务
@ -2000,11 +2176,40 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.UserService.UpdateUser(langguanApi.Model.Dto.UserUpdate)">
更新用户信息
<member name="M:langguanApi.Service.UserService.Exist(langguanApi.Model.Dto.SystemConfigurationDto.UserDto)">
<summary>
用户是否存在
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.UserService.AddUser(langguanApi.Model.Dto.SystemConfigurationDto.UserDto)">
<summary>
新增用户
</summary>
<param name="input">新增用户dto</param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.UserService.GetUserList(langguanApi.Model.Dto.SystemConfigurationDto.UserQueryDto)">
<summary>
获取用户列表
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.UserService.GetUserById(System.String)">
<summary>
根据用户Id获取用户信息
</summary>
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.UserService.DeleteUser(System.String)">
删除用户
<summary>
作废用户的方法
</summary>
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.WeatherService.GetWeather">
<summary>

10
langguanApi/Controllers/MenuController.cs
View File

@ -56,13 +56,13 @@ namespace langguanApi.Controllers
/// <summary>
/// 删除菜单
/// </summary>
/// <param name="id"></param>
/// <param name="ids"></param>
/// <returns></returns>
[HttpDelete("DeleteMenu")]
public async Task<IActionResult> DeleteMenu(string id)
[HttpDelete("remove")]
public async Task<IActionResult> DeleteMenu(IEnumerable<string> ids)
{
var result = await _menuService.DeleteMenu(id);
return Ok(result);
await _menuService.BatchRemoveAsync(ids);
return Ok(new ApiResult());
}
}
}

5
langguanApi/Middleware/CustomerExceptionFilter.cs
View File

@ -26,11 +26,12 @@ namespace langguanApi.Middleware
{
if (context.ExceptionHandled == false)
{
var json = new { cdoe = -1, msg = context.Exception.Message, data = context.Exception.Data };
var json = new { code = -1, msg = context.Exception.Message, data = context.Exception.Data };
context.HttpContext.Response.StatusCode = 400;
context.Result = new JsonResult(json);
}
_logger.LogError($"请求出现异常,地址：{context.HttpContext?.Request?.Path}，请求方式：{context.HttpContext.Request.Method}，异常信息：{context.Exception.Message}");
_logger.LogError($"请求出现异常,地址：{context.HttpContext?.Request?.Path}，" +
$"请求方式：{context.HttpContext.Request.Method}，异常信息：{context.Exception.Message}");
//记录异常已经处理
context.ExceptionHandled = true;
return Task.CompletedTask;

7
langguanApi/Model/Entity/Menu.cs
View File

@ -1,4 +1,6 @@
namespace langguanApi.Model.Entity
using System.ComponentModel.DataAnnotations;
namespace langguanApi.Model.Entity
{
/// <summary>
/// 菜单实体类
@ -18,7 +20,7 @@
/// </summary>
public int Sort { get; set; }
/// <summary>
/// 父菜单ID，一级菜单为null
/// 父菜单ID，一级菜单为"0"
/// </summary>
public string ParentId { get; set; }
}
@ -43,6 +45,7 @@
}
public class UpdateMenuDto : AddMenuDto
{
[Required]
public string Id { get; set; }
}
public class MenuTreeDto

62
langguanApi/Service/MenuService.cs
View File

@ -28,25 +28,8 @@ namespace langguanApi.Service
/// <returns></returns>
public async Task<ApiResult> AddMenu(AddMenuDto menu)
{
try
{
var entity = menu.Adapt<Menu>();
await base.CreateAsync(entity);
}
catch (Exception ex)
{
_logger.LogError($"新增菜单出现异常,请求参数:{Newtonsoft.Json.JsonConvert.SerializeObject(menu)}," +
$"请求接口：'api/Menu/AddMenu'，" +
$"异常信息：{ex.Message}," +
$"异常位置:{ex.StackTrace}"
);
return new ApiResult { code = 1, msg = "保存菜单失败", data = false };
}
finally
{
_logger.LogInformation($"新增菜单参数：menu:{Newtonsoft.Json.JsonConvert.SerializeObject(menu)}");
}
var entity = menu.Adapt<Menu>();
await base.CreateAsync(entity);
return new ApiResult { code = 0, msg = "保存菜单信息成功", data = true };
}
/// <summary>
@ -56,29 +39,8 @@ namespace langguanApi.Service
/// <returns></returns>
public async Task<ApiResult> UpdateMenu(UpdateMenuDto menu)
{
try
{
if (string.IsNullOrEmpty(menu.Id))
{
return new ApiResult() { code = 0, data = false, msg = "更新菜单失败，Id不能为空" };
}
var entity = menu.Adapt<Menu>();
await base.UpdateAsync(entity.Id, entity);
}
catch (Exception ex)
{
_logger.LogError($"修改菜单出现异常,请求参数:{Newtonsoft.Json.JsonConvert.SerializeObject(menu)}," +
$"请求接口：'api/Menu/UpdateMenu'，" +
$"异常信息：{ex.Message}," +
$"异常位置:{ex.StackTrace}"
);
return new ApiResult { code = 1, msg = "保存菜单失败", data = false };
}
finally
{
_logger.LogInformation($"修改菜单参数：menu:{Newtonsoft.Json.JsonConvert.SerializeObject(menu)}");
}
var entity = menu.Adapt<Menu>();
await base.UpdateAsync(entity.Id, entity);
return new ApiResult() { code = 0, data = true, msg = "更新菜单成功" };
}
/// <summary>
@ -87,13 +49,8 @@ namespace langguanApi.Service
/// <returns></returns>
public async Task<ApiResult> GetMenuTree()
{
//Expression<Func<Menu, bool>> exp = filter => filter.IsDelete == false;
//if (!string.IsNullOrEmpty(input.key))
//{
// exp = exp.And(filter => filter.Name.Contains(input.key));
//}
List<MenuTreeDto> dto = new List<MenuTreeDto>();
var MenuList = await GetChildList(null);
var MenuList = await GetChildList("0");
foreach (var item in MenuList)
{
dto.Add(new MenuTreeDto()
@ -115,14 +72,11 @@ namespace langguanApi.Service
/// <returns></returns>
public async Task<List<MenuTreeDto>> GetChildList(string parentId)
{
Expression<Func<Menu, bool>> exp = filter => filter.IsDelete == false && filter.ParentId == parentId;
Expression<Func<Menu, bool>> expDataSource = filter => filter.IsDelete;
Expression<Func<Menu, bool>> exp = filter => filter.IsDelete == false&& filter.ParentId == parentId;
var list = (await GetListWithExp(exp))
.OrderBy(x => x.Sort)
.ToList().Adapt<List<MenuTreeDto>>();
var DataSourceList = (await GetAsync())
.OrderBy(x => x.Sort)
.ToList();//拿到所有数据源，筛选结果
var DataSourceList = (await GetAsync()).ToList();//拿到所有数据源，筛选结果
foreach (var item in list)
{
item.Children = await GetChildList(item.Id);
@ -133,7 +87,7 @@ namespace langguanApi.Service
}
/// <summary>
/// 作废菜单
/// 作废菜单 (废弃，不做处理)
/// </summary>
/// <param name="id">当前菜单id</param>
/// <returns></returns>