fix
This commit is contained in:
@@ -1,29 +1,24 @@
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Service.Message;
|
||||
using Application.Dto.Message;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Application;
|
||||
|
||||
namespace WebApi.Controllers;
|
||||
|
||||
[Authorize]
|
||||
[ApiController]
|
||||
[Route("api/[controller]/[action]")]
|
||||
public class MessageRecordController(IMessageService messageService, ILogger<MessageRecordController> logger) : ControllerBase
|
||||
public class MessageRecordController(
|
||||
IMessageRecordApplication messageApplication
|
||||
) : ControllerBase
|
||||
{
|
||||
/// <summary>
|
||||
/// 获取消息列表
|
||||
/// </summary>
|
||||
[HttpGet]
|
||||
public async Task<PagedResponse<MessageRecord>> GetList([FromQuery] int pageIndex = 1, [FromQuery] int pageSize = 20)
|
||||
public async Task<PagedResponse<MessageRecordResponse>> GetList([FromQuery] int pageIndex = 1, [FromQuery] int pageSize = 20)
|
||||
{
|
||||
try
|
||||
{
|
||||
var (list, total) = await messageService.GetPagedListAsync(pageIndex, pageSize);
|
||||
return PagedResponse<MessageRecord>.Done(list.ToArray(), (int)total);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogError(ex, "获取消息列表失败");
|
||||
return PagedResponse<MessageRecord>.Fail($"获取消息列表失败: {ex.Message}");
|
||||
}
|
||||
var result = await messageApplication.GetListAsync(pageIndex, pageSize);
|
||||
return PagedResponse<MessageRecordResponse>.Done(result.Data, result.Total);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -32,16 +27,8 @@ public class MessageRecordController(IMessageService messageService, ILogger<Mes
|
||||
[HttpGet]
|
||||
public async Task<BaseResponse<long>> GetUnreadCount()
|
||||
{
|
||||
try
|
||||
{
|
||||
var count = await messageService.GetUnreadCountAsync();
|
||||
return count.Ok();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogError(ex, "获取未读消息数量失败");
|
||||
return $"获取未读消息数量失败: {ex.Message}".Fail<long>();
|
||||
}
|
||||
var count = await messageApplication.GetUnreadCountAsync();
|
||||
return count.Ok();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -50,16 +37,8 @@ public class MessageRecordController(IMessageService messageService, ILogger<Mes
|
||||
[HttpPost]
|
||||
public async Task<BaseResponse<bool>> MarkAsRead([FromQuery] long id)
|
||||
{
|
||||
try
|
||||
{
|
||||
var result = await messageService.MarkAsReadAsync(id);
|
||||
return result.Ok();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogError(ex, "标记消息已读失败,ID: {Id}", id);
|
||||
return $"标记消息已读失败: {ex.Message}".Fail<bool>();
|
||||
}
|
||||
var result = await messageApplication.MarkAsReadAsync(id);
|
||||
return result.Ok();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -68,16 +47,8 @@ public class MessageRecordController(IMessageService messageService, ILogger<Mes
|
||||
[HttpPost]
|
||||
public async Task<BaseResponse<bool>> MarkAllAsRead()
|
||||
{
|
||||
try
|
||||
{
|
||||
var result = await messageService.MarkAllAsReadAsync();
|
||||
return result.Ok();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogError(ex, "全部标记已读失败");
|
||||
return $"全部标记已读失败: {ex.Message}".Fail<bool>();
|
||||
}
|
||||
var result = await messageApplication.MarkAllAsReadAsync();
|
||||
return result.Ok();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -86,16 +57,8 @@ public class MessageRecordController(IMessageService messageService, ILogger<Mes
|
||||
[HttpPost]
|
||||
public async Task<BaseResponse<bool>> Delete([FromQuery] long id)
|
||||
{
|
||||
try
|
||||
{
|
||||
var result = await messageService.DeleteAsync(id);
|
||||
return result.Ok();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogError(ex, "删除消息失败,ID: {Id}", id);
|
||||
return $"删除消息失败: {ex.Message}".Fail<bool>();
|
||||
}
|
||||
var result = await messageApplication.DeleteAsync(id);
|
||||
return result.Ok();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -104,15 +67,7 @@ public class MessageRecordController(IMessageService messageService, ILogger<Mes
|
||||
[HttpPost]
|
||||
public async Task<BaseResponse<bool>> Add([FromBody] MessageRecord message)
|
||||
{
|
||||
try
|
||||
{
|
||||
var result = await messageService.AddAsync(message);
|
||||
return result.Ok();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogError(ex, "新增消息失败");
|
||||
return $"新增消息失败: {ex.Message}".Fail<bool>();
|
||||
}
|
||||
var result = await messageApplication.AddAsync(message);
|
||||
return result.Ok();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user