优化代码
This commit is contained in:
@@ -26,16 +26,12 @@ public class TransactionCategoryController(
|
||||
categories = (await categoryRepository.GetAllAsync()).ToList();
|
||||
}
|
||||
|
||||
return new BaseResponse<List<TransactionCategory>>
|
||||
{
|
||||
Success = true,
|
||||
Data = categories
|
||||
};
|
||||
return categories.Ok();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogError(ex, "获取分类列表失败");
|
||||
return BaseResponse<List<TransactionCategory>>.Fail($"获取分类列表失败: {ex.Message}");
|
||||
return $"获取分类列表失败: {ex.Message}".Fail<List<TransactionCategory>>();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,19 +46,15 @@ public class TransactionCategoryController(
|
||||
var category = await categoryRepository.GetByIdAsync(id);
|
||||
if (category == null)
|
||||
{
|
||||
return BaseResponse<TransactionCategory>.Fail("分类不存在");
|
||||
return "分类不存在".Fail<TransactionCategory>();
|
||||
}
|
||||
|
||||
return new BaseResponse<TransactionCategory>
|
||||
{
|
||||
Success = true,
|
||||
Data = category
|
||||
};
|
||||
return category.Ok();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogError(ex, "获取分类详情失败, Id: {Id}", id);
|
||||
return BaseResponse<TransactionCategory>.Fail($"获取分类详情失败: {ex.Message}");
|
||||
return $"获取分类详情失败: {ex.Message}".Fail<TransactionCategory>();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -78,7 +70,7 @@ public class TransactionCategoryController(
|
||||
var existing = await categoryRepository.GetByNameAndTypeAsync(dto.Name, dto.Type);
|
||||
if (existing != null)
|
||||
{
|
||||
return BaseResponse<long>.Fail("已存在相同名称的分类");
|
||||
return "已存在相同名称的分类".Fail<long>();
|
||||
}
|
||||
|
||||
var category = new TransactionCategory
|
||||
@@ -90,21 +82,17 @@ public class TransactionCategoryController(
|
||||
var result = await categoryRepository.AddAsync(category);
|
||||
if (result)
|
||||
{
|
||||
return new BaseResponse<long>
|
||||
{
|
||||
Success = true,
|
||||
Data = category.Id
|
||||
};
|
||||
return category.Id.Ok();
|
||||
}
|
||||
else
|
||||
{
|
||||
return BaseResponse<long>.Fail("创建分类失败");
|
||||
return "创建分类失败".Fail<long>();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogError(ex, "创建分类失败, Dto: {@Dto}", dto);
|
||||
return BaseResponse<long>.Fail($"创建分类失败: {ex.Message}");
|
||||
return $"创建分类失败: {ex.Message}".Fail<long>();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -119,7 +107,7 @@ public class TransactionCategoryController(
|
||||
var category = await categoryRepository.GetByIdAsync(dto.Id);
|
||||
if (category == null)
|
||||
{
|
||||
return BaseResponse.Fail("分类不存在");
|
||||
return "分类不存在".Fail();
|
||||
}
|
||||
|
||||
// 如果修改了名称,检查同名
|
||||
@@ -128,7 +116,7 @@ public class TransactionCategoryController(
|
||||
var existing = await categoryRepository.GetByNameAndTypeAsync(dto.Name, category.Type);
|
||||
if (existing != null && existing.Id != dto.Id)
|
||||
{
|
||||
return BaseResponse.Fail("已存在相同名称的分类");
|
||||
return "已存在相同名称的分类".Fail();
|
||||
}
|
||||
|
||||
// 同步更新交易记录中的分类名称
|
||||
@@ -141,17 +129,17 @@ public class TransactionCategoryController(
|
||||
var success = await categoryRepository.UpdateAsync(category);
|
||||
if (success)
|
||||
{
|
||||
return new BaseResponse { Success = true };
|
||||
return "更新分类成功".Ok();
|
||||
}
|
||||
else
|
||||
{
|
||||
return BaseResponse.Fail("更新分类失败");
|
||||
return "更新分类失败".Fail();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogError(ex, "更新分类失败, Dto: {@Dto}", dto);
|
||||
return BaseResponse.Fail($"更新分类失败: {ex.Message}");
|
||||
return $"更新分类失败: {ex.Message}".Fail();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -167,23 +155,23 @@ public class TransactionCategoryController(
|
||||
var inUse = await categoryRepository.IsCategoryInUseAsync(id);
|
||||
if (inUse)
|
||||
{
|
||||
return BaseResponse.Fail("该分类已被使用,无法删除");
|
||||
return "该分类已被使用,无法删除".Fail();
|
||||
}
|
||||
|
||||
var success = await categoryRepository.DeleteAsync(id);
|
||||
if (success)
|
||||
{
|
||||
return new BaseResponse { Success = true };
|
||||
return BaseResponse.Done();
|
||||
}
|
||||
else
|
||||
{
|
||||
return BaseResponse.Fail("删除分类失败,分类不存在");
|
||||
return "删除分类失败,分类不存在".Fail();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogError(ex, "删除分类失败, Id: {Id}", id);
|
||||
return BaseResponse.Fail($"删除分类失败: {ex.Message}");
|
||||
return $"删除分类失败: {ex.Message}".Fail();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -204,21 +192,17 @@ public class TransactionCategoryController(
|
||||
var result = await categoryRepository.AddRangeAsync(categories);
|
||||
if (result)
|
||||
{
|
||||
return new BaseResponse<int>
|
||||
{
|
||||
Success = true,
|
||||
Data = categories.Count
|
||||
};
|
||||
return categories.Count.Ok();
|
||||
}
|
||||
else
|
||||
{
|
||||
return BaseResponse<int>.Fail("批量创建分类失败");
|
||||
return "批量创建分类失败".Fail<int>();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogError(ex, "批量创建分类失败, Count: {Count}", dtoList.Count);
|
||||
return BaseResponse<int>.Fail($"批量创建分类失败: {ex.Message}");
|
||||
return $"批量创建分类失败: {ex.Message}".Fail<int>();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user