Yxw/Atomx
1
0
Fork 0
Code Issues 24 Pull Requests Actions Packages Projects Releases Wiki Activity

增加app 版本管理

Browse Source
This commit is contained in:
Seany
2025-12-17 00:37:57 +08:00
parent 9d396fa96e
commit da8ac8a22b
12 changed files with 751 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Atomx.Admin/Atomx.Admin.Client/Models/AppVersionModel.cs
View File

@@ -1,15 +1,10 @@
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
namespace Atomx.Admin.Client.Models
namespace Atomx.Admin.Client.Models
{
public class AppVersionModel
{
/// <summary>
/// 数据ID
/// </summary>
[DatabaseGenerated(DatabaseGeneratedOption.None)]
[Key]
public long Id { get; set; }
/// <summary>
@@ -20,43 +15,36 @@ namespace Atomx.Admin.Client.Models
/// <summary>
/// 应用名称KEY
/// </summary>
[Column(TypeName = "varchar(64)")]
public string AppName { get; set; } = string.Empty;
/// <summary>
/// 版本标题
/// </summary>
[Column(TypeName = "varchar(64)")]
public string Title { get; set; } = string.Empty;
/// <summary>
/// 版本
/// </summary>
[Column(TypeName = "varchar(64)")]
public string Version { get; set; } = string.Empty;
/// <summary>
/// 主版本号(major)无法向下兼容时，需要递增
/// </summary>
[Column(TypeName = "varchar(64)")]
public int VersionX { get; set; }
/// <summary>
/// 次版本号(minor)新增新的特性时，需要递增
/// </summary>
[Column(TypeName = "varchar(64)")]
public int VersionY { get; set; }
/// <summary>
/// 修订版本号(patch)修复问题时，需要递增
/// </summary>
[Column(TypeName = "varchar(64)")]
public int VersionZ { get; set; }
/// <summary>
/// 版本日期
/// </summary>
[Column(TypeName = "varchar(64)")]
public int VersionDate { get; set; }
/// <summary>
@@ -67,7 +55,6 @@ namespace Atomx.Admin.Client.Models
/// <summary>
/// 更新内容说明
/// </summary>
[Column(TypeName = "text")]
public string Content { get; set; } = string.Empty;
/// <summary>

2
Atomx.Admin/Atomx.Admin.Client/Models/AppVersionSearch.cs
View File

@@ -10,7 +10,7 @@
/// <summary>
/// 状态
/// </summary>
public string Status { get; set; } = string.Empty;
public string? Status { get; set; } = string.Empty;
/// <summary>
/// 开始时间

5
Atomx.Admin/Atomx.Admin.Client/Models/CurrencyModel.cs
View File

@@ -52,5 +52,10 @@
/// 是否编辑
/// </summary>
public bool IsEdit { get; set; }
/// <summary>
/// 是否主货币
/// </summary>
public bool PrimaryCurrency { get; set; }
}
}

20
Atomx.Admin/Atomx.Admin.Client/Models/CurrencySearchModel.cs Normal file
View File

@@ -0,0 +1,20 @@
namespace Atomx.Admin.Client.Models
{
public class CurrencySearchModel:BaseSearch
{
/// <summary>
/// 用户名
/// </summary>
public string Name { get; set; } = string.Empty;
/// <summary>
/// 状态
/// </summary>
public string Status { get; set; } = string.Empty;
/// <summary>
/// 开始时间
/// </summary>
public DateTime?[] RangeTime { get; set; } = new DateTime?[] { null, null };
}
}

247
Atomx.Admin/Atomx.Admin.Client/Pages/Settings/CurrencyList.razor
View File

@@ -3,20 +3,257 @@
@inject ILogger<CurrencyList> Logger
@attribute [Authorize]
<PageContainer Title="货币管理">
<PageTitle>货币管理</PageTitle>
<PageContainer Title="语言管理">
<Breadcrumb>
<Breadcrumb>
<BreadcrumbItem Href="/">管理后台</BreadcrumbItem>
<BreadcrumbItem Href="/admin/list">系统功能</BreadcrumbItem>
<BreadcrumbItem>Home</BreadcrumbItem>
<BreadcrumbItem>系统配置</BreadcrumbItem>
<BreadcrumbItem>货币管理</BreadcrumbItem>
</Breadcrumb>
</Breadcrumb>
<ChildContent>
<h3>Tools</h3>
<Spin Spinning="pageLoading">
<Card>
<Form @ref="searchForm" Model="search" Layout="FormLayout.Inline" Class="search-form" OnFinish="OnSearchFinish">
<Row Justify="RowJustify.Start" Gutter="16">
<Col>
<FormItem Label="名称">
<Input @bind-Value="search.Name" Placeholder="名称" AllowClear />
</FormItem>
</Col>
@if (searchExpand)
{
<AntDesign.Col>
<FormItem Label="发布时间">
<RangePicker @bind-Value="search.RangeTime"></RangePicker>
</FormItem>
</AntDesign.Col>
<AntDesign.Col>
<FormItem Label="状态">
<SimpleSelect DefaultValue="" Style="width:120px;" @bind-Value="@search.Status">
<SelectOptions>
<SimpleSelectOption Value="" Label="全部"></SimpleSelectOption>
<SimpleSelectOption Value="1" Label="草稿"></SimpleSelectOption>
<SimpleSelectOption Value="2" Label="已发布"></SimpleSelectOption>
<SimpleSelectOption Value="3" Label="已删除"></SimpleSelectOption>
</SelectOptions>
</SimpleSelect>
</FormItem>
</AntDesign.Col>
}
<Col>
<div class="ant-form-item">
<Button Type="ButtonType.Primary" HtmlType="submit">查询</Button>
<Button Style="margin: 0 8px;" OnClick="OnSearchReset">重置</Button>
<a style="font-size:12px; display:flex; align-items:center;text-align:center;" @onclick="()=>{searchExpand=!searchExpand;}">
<Icon Type="@(searchExpand?"up":"down")"></Icon> @if (searchExpand)
{
<span>收起</span>
}
else
{
<span>展开</span>
}
</a>
</div>
</Col>
</Row>
</Form>
</Card>
<Card Title="" Class="hideborder">
<Extra>
<div class="extraContent">
<Button Type="ButtonType.Primary" HtmlType="submit" OnClick="HandleAddNew">新增货币</Button>
</div>
</Extra>
<ChildContent>
<Table DataSource="PagingList.Items" PageSize="100" HidePagination="true">
<Selection CheckStrictly />
<PropertyColumn Property="c => c.Name" Title="语言" />
<PropertyColumn Property="c => c.CurrencyCode" Title="货币代码" />
<PropertyColumn Property="c => c.Rate" Title="汇率" />
<PropertyColumn Property="c => c.PrimaryCurrency" Title="默认货币">
@if (context.PrimaryCurrency)
{
<AntDesign.Text Type="TextElementType.Success"><Icon Type="check" Theme="IconThemeType.Outline" /></AntDesign.Text>
}
else
{
<Icon Type="minus" Theme="IconThemeType.Outline" />
}
</PropertyColumn>
<PropertyColumn Property="c => c.Enabled" Title="状态">
@if (context.Enabled)
{
<Text>已激活</text>
}
else
{
<Text>未激活</text>
}
</PropertyColumn>
<PropertyColumn Property="c => c.DisplayOrder" Title="排序" />
<ActionColumn Title="操作" Align="ColumnAlign.Right">
<Space>
<SpaceItem>
<a @onclick="(e)=>HandleEdit(context)">编辑</a>
</SpaceItem>
@*<SpaceItem>
<Popconfirm Placement="@Placement.Left" Title="@("删除这条数据无法恢复，您确定要删除吗?")"
OnConfirm="@(e=>HandleDeleteConfirmAsync(e,context.Id))"
OkText="确定"
CancelText="取消">
<a>删除</a>
</Popconfirm>
</SpaceItem>*@
</Space>
</ActionColumn>
</Table>
<br />
<Row Justify="RowJustify.End">
<Pagination PageIndex="pager.Index" Total="PagingList.Count" PageSize="PagingList.Size" ShowSizeChanger="false" OnChange="OnPageChanged"></Pagination>
</Row>
</ChildContent>
</Card>
</Spin>
</ChildContent>
</PageContainer>
@code {
[Parameter]
public string Locale { get; set; } = string.Empty;
}
[SupplyParameterFromQuery]
int? Page { get; set; }
[SupplyParameterFromQuery(Name = "size")]
int? PageSize { get; set; }
bool pageLoading = false;
bool searchExpand = false;
Form<CurrencySearchModel> searchForm = new();
CurrencySearchModel search = new();
PagingList<CurrencyModel> PagingList = new() { Size = 20 };
protected override async Task OnInitializedAsync()
{
await base.OnInitializedAsync();
}
protected override async Task OnParametersSetAsync()
{
loadQueryString();
await LoadListAsync();
await base.OnParametersSetAsync();
}
void loadQueryString()
{
var uri = new Uri(Navigation.Uri);
var query = uri.Query;
search.Name = query.GetQueryString("Name");
search.Status = query.GetQueryString("Status");
var data = query.GetQueryString("RangeTime");
if (!string.IsNullOrEmpty(data))
{
var rangetime = data.Split("-");
if (rangetime != null && rangetime.Length > 0)
{
searchExpand = true;
search.RangeTime[0] = rangetime[0].NumberToDateTime();
search.RangeTime[1] = rangetime[1].NumberToDateTime();
StateHasChanged();
}
}
}
async Task LoadListAsync()
{
try
{
pageLoading = true;
var url = "/api/currency/search";
var apiResult = await HttpService.GetPagingList<CurrencyModel>(url, search, Page.GetValueOrDefault(1), PageSize.GetValueOrDefault(20));
if (apiResult.Success)
{
if (apiResult.Data != null)
{
PagingList = apiResult.Data;
}
}
else if (apiResult.Code == 403)
{
ModalService.Error(new ConfirmOptions() { Title = "权限不足", Content = apiResult.Message });
}
StateHasChanged();
}
finally
{
pageLoading = false;
}
}
void OnSearchReset()
{
search = new CurrencySearchModel();
searchForm?.Reset();
}
private void OnSearch(int page)
{
var queryString = search.BuildQueryString();
if (string.IsNullOrEmpty(queryString))
{
if (page > 1)
{
Navigation.NavigateTo($"/currency/list?page={page}");
}
else
{
Navigation.NavigateTo($"/currency/list");
}
}
else
{
if (page > 1)
{
Navigation.NavigateTo($"/currency/list?page={page}&{queryString}");
}
else
{
Navigation.NavigateTo($"/currency/list?{queryString}");
}
}
}
void OnSearchFinish()
{
Page = Page.GetValueOrDefault(1) - 1;
OnSearch(Page.Value);
}
private void OnPageChanged(PaginationEventArgs args)
{
OnSearch(args.Page);
}
void HandleAddNew()
{
Navigation.NavigateTo($"/currency/edit");
}
void HandleEdit(CurrencyModel model)
{
Navigation.NavigateTo($"/currency/edit/{model.Id}");
}
}

152
Atomx.Admin/Atomx.Admin.Client/Pages/SiteApps/AppVersionEdit.razor Normal file
View File

@@ -0,0 +1,152 @@
@page "/system/app/version/create"
@page "/system/app/version/edit/{id:long}"
@page "/{locale}/system/app/version/create"
@page "/{locale}/system/app/version/edit/{id:long}"
@inject ILogger<AppVersionEdit> Logger
@attribute [Authorize]
<PageContainer Title="@(Id > 0 ? "编辑版本信息" : "新增版本信息")">
<Breadcrumb>
<Breadcrumb>
<BreadcrumbItem Href="/">管理后台</BreadcrumbItem>
<BreadcrumbItem Href="/admin/list">系统功能</BreadcrumbItem>
<BreadcrumbItem>版本管理</BreadcrumbItem>
</Breadcrumb>
</Breadcrumb>
<ChildContent>
<Spin Spinning="pageLoading">
<Card Title="版本信息">
<Form @ref="editform" Model="@model" LabelColSpan="5" WrapperColSpan="14" OnFinish="OnFormFinishAsync">
<FormItem Label="应用名称" Required>
<Input @bind-Value="@context.AppName" Placeholder="应用名称" />
</FormItem>
<FormItem Label="版本标题" Required>
<Input @bind-Value="@context.Title" Placeholder="版本标题" />
</FormItem>
<FormItem Label="运行平台">
<Select TItemValue="int" TItem="int" Style="width:250px;" @bind-Value="@context.Platform">
<SelectOption Value="0" Label="请选择运行平台"></SelectOption>
<SelectOption Value="1" Label="Windows桌面"></SelectOption>
<SelectOption Value="2" Label="安卓系统"></SelectOption>
<SelectOption Value="3" Label="iOS系统"></SelectOption>
</Select>
</FormItem>
<FormItem Label="版本状态">
<Select TItemValue="int" TItem="int" Style="width:250px;" @bind-Value="@context.VersionState">
<SelectOption Value="0" Label="请选版本状态"></SelectOption>
<SelectOption Value="1" Label="开发版"></SelectOption>
<SelectOption Value="2" Label="Alphal内测版"></SelectOption>
<SelectOption Value="3" Label="Beta公测版"></SelectOption>
<SelectOption Value="4" Label="Rc版"></SelectOption>
<SelectOption Value="5" Label="正式版"></SelectOption>
</Select>
</FormItem>
<FormItem Label="版本信息" Required>
<InputGroup Compact>
<Input @bind-Value="@context.VersionX" Placeholder="主版本号" Style="width: 20%;" />
<Input @bind-Value="@context.VersionY" Placeholder="次版本号" Style="width: 20%;" />
<Input @bind-Value="@context.VersionZ" Placeholder="修订版本" Style="width: 20%;" />
</InputGroup>
</FormItem>
<FormItem Label="更新内容" Required>
<TextArea Rows="10" @bind-Value="@context.Content" Placeholder="更新内容" />
</FormItem>
<FormItem Label="状态">
<RadioGroup @bind-Value="@context.Status">
<Radio RadioButton Value=1>草稿</Radio>
<Radio RadioButton Value=2>发布</Radio>
</RadioGroup>
</FormItem>
<FormItem WrapperCol="new ColLayoutParam { Span = 24, Offset = 5 }">
<Button Type="@ButtonType.Primary" HtmlType="submit">
提交保存
</Button>
</FormItem>
</Form>
</Card>
</Spin>
</ChildContent>
</PageContainer>
@code {
[Parameter]
public string Locale { get; set; } = string.Empty;
[Parameter]
public long Id { get; set; }
[SupplyParameterFromForm]
AppVersionModel model { get; set; } = new();
Form<AppVersionModel> editform = null!;
bool pageLoading = false;
protected override void OnInitialized()
{
base.OnInitialized();
}
protected override void OnParametersSet()
{
if (Id > 0)
{
LoadData();
}
base.OnParametersSet();
}
async void LoadData()
{
pageLoading = true;
var url = $"/api/appversion/{Id}";
var apiResult = await HttpService.Get<ApiResult<AppVersion>>(url);
if (apiResult.Success)
{
if (apiResult.Data == null)
{
Navigation.NavigateTo($"/system/app/version/create");
}
else
{
model = apiResult.Data.Adapt<AppVersionModel>();
}
}
else
{
Navigation.NavigateTo($"/system/app/version/create");
}
pageLoading = false;
StateHasChanged();
}
async void OnFormFinishAsync()
{
if (editform.Validate())
{
var result = new ApiResult<string>();
if (model.Id > 0)
{
var url = $"api/appversion/edit";
result = await HttpService.Post<ApiResult<string>>(url, model);
}
else
{
var url = $"api/appversion/add";
result = await HttpService.Post<ApiResult<string>>(url, model);
}
if (result.Code == (int)ResultCode.Success)
{
await ModalService.InfoAsync(new ConfirmOptions() { Title = "提示", Content = "数据提交成功!" });
Navigation.NavigateTo($"/system/app/version/list");
}
else
{
await ModalService.ErrorAsync(new ConfirmOptions() { Title = "服务异常", Content = result.Message });
}
}
}
}

20
Atomx.Admin/Atomx.Admin.Client/Pages/SiteApps/AppVersionList.razor
View File

@@ -17,19 +17,19 @@
<Form @ref="searchForm" Model="search" Layout="FormLayout.Inline" Class="search-form" OnFinish="OnSearchFinish">
<Row Justify="RowJustify.Start" Gutter="16">
<Col>
<FormItem Label="帐号">
<Input @bind-Value="search.Name" Placeholder="帐号" AllowClear />
<FormItem Label="名称">
<Input @bind-Value="search.Name" Placeholder="名称" AllowClear />
</FormItem>
</Col>
<Col>
<FormItem Label="状态">
@* <SimpleSelect DefaultValue="" @bind-Value="search.Status">
<SimpleSelect DefaultValue="" Style="width:120px;" @bind-Value="@context.Status">
<SelectOptions>
<SimpleSelectOption Value="">全部</SimpleSelectOption>
<SimpleSelectOption Value="1">启用</SimpleSelectOption>
<SimpleSelectOption Value="0">禁用</SimpleSelectOption>
<SimpleSelectOption Value="" Label="全部"></SimpleSelectOption>
<SimpleSelectOption Value="1" Label="草稿"></SimpleSelectOption>
<SimpleSelectOption Value="2" Label="已发布"></SimpleSelectOption>
</SelectOptions>
</SimpleSelect> *@
</SimpleSelect>
</FormItem>
</Col>
<Col>
@@ -46,7 +46,7 @@
<Table DataSource="PagingList.Items" PageSize="100" HidePagination="true" Resizable>
<TitleTemplate>
<Flex Justify="FlexJustify.SpaceBetween">
帐号列表
版本记录
<div>
<AuthorizeCheck Permission="@Permissions.Admin.Create">
<Button Class="me-3" OnClick="OnCreateClick" Type="ButtonType.Primary">新增</Button>
@@ -110,11 +110,11 @@
<PropertyColumn Property="c => c.Status" Title="状态" Width="80px" Align="ColumnAlign.Center">
@if (context.Status == 1)
{
<Tag T="string" Size="Size.Small" Variant="Variant.Text">草稿</Tag>
<Tag>草稿</Tag>
}
else if (context.Status == 2)
{
<Tag T="string" Size="Size.Small" Variant="Variant.Text">发布</Tag>
<Tag>发布</Tag>
}
else
{

3
Atomx.Admin/Atomx.Admin.Client/Validators/AppVersionModelValidator.cs
View File

@@ -1,12 +1,13 @@
using Atomx.Admin.Client.Models;
using Atomx.Common.Enums;
using FluentValidation;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Client.Validators
{
public class AppVersionModelValidator : AbstractValidator<AppVersionModel>
{
public AppVersionModelValidator()
public AppVersionModelValidator(IStringLocalizer<LoginModelValidator> localizer)
{
RuleFor(p => p.AppName).NotEmpty().WithMessage("应用名不能为空");
RuleFor(p => p.Title).NotEmpty().WithMessage("版本标题不能为空");

23
Atomx.Admin/Atomx.Admin/Controllers/AppVersionController.cs
View File

@@ -1,15 +1,16 @@
using Atomx.Admin.Client.Models;
using Atomx.Admin.Client.Validators;
using Atomx.Admin.Services;
using Atomx.Common.Entities;
using Atomx.Common.Models;
using Atomx.Data;
using Atomx.Data.Services;
using Atomx.Utils.Extension;
using FluentValidation;
using MapsterMapper;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Localization;
namespace Atomx.Admin.Controllers
{
@@ -23,6 +24,8 @@ namespace Atomx.Admin.Controllers
readonly IIdCreatorService _idCreator;
readonly IMapper _mapper;
readonly DataContext _dbContext;
readonly IValidator<AppVersionModel> _validator;
readonly IStringLocalizer<AppVersionController> _localizer;
/// <summary>
///
@@ -32,13 +35,16 @@ namespace Atomx.Admin.Controllers
/// <param name="idCreator"></param>
/// <param name="adminService"></param>
/// <param name="mapper"></param>
public AppVersionController(ILogger<AppVersionController> logger, IIdentityService identityService, IIdCreatorService idCreator, IMapper mapper, DataContext dataContext)
public AppVersionController(ILogger<AppVersionController> logger, IIdentityService identityService, IIdCreatorService idCreator,
IMapper mapper, DataContext dataContext, IValidator<AppVersionModel> validator, IStringLocalizer<AppVersionController> stringLocalizer)
{
_logger = logger;
_identityService = identityService;
_idCreator = idCreator;
_mapper = mapper;
_dbContext = dataContext;
_validator = validator;
_localizer = stringLocalizer;
}
/// <summary>
@@ -83,6 +89,13 @@ namespace Atomx.Admin.Controllers
where p.AppName.Contains(search.Name)
select p;
}
if (!string.IsNullOrEmpty(search.Status))
{
var status = search.Status.ToInt();
query = from p in query
where p.Status == status
select p;
}
if (search.StartTime.HasValue)
{
query = from p in query
@@ -140,8 +153,7 @@ namespace Atomx.Admin.Controllers
public IActionResult Add(AppVersionModel model)
{
var result = new ApiResult<string>();
var validator = new AppVersionModelValidator();
var validation = validator.Validate(model);
var validation = _validator.Validate(model);
if (!validation.IsValid)
{
var message = validation.Errors.FirstOrDefault()?.ErrorMessage ?? string.Empty;
@@ -176,8 +188,7 @@ namespace Atomx.Admin.Controllers
public IActionResult Edit(AppVersionModel model)
{
var result = new ApiResult<string>();
var validator = new AppVersionModelValidator();
var validation = validator.Validate(model);
var validation = _validator.Validate(model);
if (!validation.IsValid)
{
var message = validation.Errors.FirstOrDefault()?.ErrorMessage;

411
Atomx.Admin/Atomx.Admin/Controllers/CurrencyController.cs
View File

@@ -1,9 +1,12 @@
using Atomx.Admin.Client.Models;
using AntDesign;
using Atomx.Admin.Client.Models;
using Atomx.Admin.Services;
using Atomx.Common.Entities;
using Atomx.Common.Models;
using Atomx.Data;
using Atomx.Data.CacheServices;
using Atomx.Data.Services;
using Atomx.Utils.Extension;
using FluentValidation;
using MapsterMapper;
using Microsoft.AspNetCore.Authorization;
@@ -14,7 +17,6 @@ namespace Atomx.Admin.Controllers
{
[Route("api/[controller]")]
[ApiController]
[Authorize]
public class CurrencyController : ControllerBase
{
private readonly ILogger<CurrencyController> _logger;
@@ -39,7 +41,7 @@ namespace Atomx.Admin.Controllers
/// <param name="jwtSettings"></param>
/// <param name="cacheService"></param>
public CurrencyController(ILogger<CurrencyController> logger, IIdCreatorService idCreator, IIdentityService identityService,
DataContext dbContext, IMapper mapper, JwtSetting jwtSettings, ICacheService cacheService,IValidator<CurrencyModel> validator, IStringLocalizer<CurrencyController> stringLocalizer)
DataContext dbContext, IMapper mapper, JwtSetting jwtSettings, ICacheService cacheService, IValidator<CurrencyModel> validator, IStringLocalizer<CurrencyController> stringLocalizer)
{
_logger = logger;
_idCreator = idCreator;
@@ -52,257 +54,200 @@ namespace Atomx.Admin.Controllers
_localizer = stringLocalizer;
}
///// <summary>
///// 分页获取制造商列表
///// </summary>
///// <param name="page"></param>
///// <param name="name"></param>
///// <param name="start"></param>
///// <param name="end"></param>
///// <param name="size"></param>
///// <returns></returns>
//[HttpGet("enabled")]
//public async Task<IActionResult> GetEnabledList()
/// <summary>
/// 获取可用的货币列表
/// </summary>
/// <param name="page"></param>
/// <param name="name"></param>
/// <param name="start"></param>
/// <param name="end"></param>
/// <param name="size"></param>
/// <returns></returns>
[HttpGet("enabled")]
public async Task<IActionResult> GetEnabledList()
{
var result = new ApiResult<List<Currency>>();
var data = await _cacheService.GetCurrencies();
result.Data = data;
return new JsonResult(result);
}
/// <summary>
/// 分页获取制造商列表
/// </summary>
/// <param name="page"></param>
/// <param name="name"></param>
/// <param name="start"></param>
/// <param name="end"></param>
/// <param name="size"></param>
/// <returns></returns>
[HttpPost("search")]
public async Task<IActionResult> GetList(CurrencySearchModel search, int page, int size = 20)
{
var startTime = search.RangeTime[0];
if (startTime != null)
{
search.StartTime = startTime.Value.ConvertStartDateUTCTime();
}
try
{
var endTime = search.RangeTime[1];
if (endTime != null)
{
search.EndTime = endTime.Value.ConvertEndDateUTCTime();
}
}
catch
{
search.EndTime = null;
}
if (page < 1)
{
page = 1;
}
var result = new ApiResult<PagingList<CurrencyModel>>();
var list = new PagingList<CurrencyModel>() { Index = page, Size = size };
var table = new List<Currency>();
var query = from p in _dbContext.Currencies
select p;
if (!string.IsNullOrEmpty(search.Name))
{
query = from p in query
where p.Name.Contains(search.Name)
select p;
}
if (search.StartTime.HasValue)
{
query = from p in query
where p.CreateTime >= search.StartTime.Value
select p;
}
if (search.EndTime.HasValue)
{
query = from p in query
where p.CreateTime <= search.EndTime.Value
select p;
}
list.Count = query.Count();
table = query.OrderByDescending(p => p.CreateTime).Skip((page - 1) * size).Take(size).ToList();
var ids = table.Select(p => p.Id).ToList();
list.Items = _mapper.Map<List<CurrencyModel>>(table);
//var config = await _cacheService.GetGeneralConfig();
//foreach (var item in list.Items)
//{
// var result = new Result<List<Currency>>();
// var data = await _cacheService.GetCurrencies();
// result.Data = data;
// return new JsonResult(result);
//}
///// <summary>
///// 分页获取制造商列表
///// </summary>
///// <param name="page"></param>
///// <param name="name"></param>
///// <param name="start"></param>
///// <param name="end"></param>
///// <param name="size"></param>
///// <returns></returns>
//[HttpGet("list")]
//public async Task<IActionResult> GetList(int page, string? name, DateTime? start, DateTime? end, int size = 20)
//{
// if (page < 1)
// {
// page = 1;
// }
// var result = new Result<PagingList<CurrencyModel>>();
// var list = new PagingList<CurrencyModel>() { Index = page, Size = size };
// var table = new List<Currency>();
// var query = from p in _dbContext.Currencies
// select p;
// if (!string.IsNullOrEmpty(name))
// {
// query = from p in query
// where p.Name.Contains(name)
// select p;
// }
// if (start.HasValue)
// {
// query = from p in query
// where p.CreateTime >= start.Value
// select p;
// }
// if (end.HasValue)
// {
// query = from p in query
// where p.CreateTime <= end.Value
// select p;
// }
// list.Count = query.Count();
// table = query.OrderByDescending(p => p.CreateTime).Skip((page - 1) * size).Take(size).ToList();
// var ids = table.Select(p => p.Id).ToList();
// list.Items = _mapper.Map<List<CurrencyModel>>(table);
// var config = await _cacheService.GetGeneralConfig();
// foreach (var item in list.Items)
// {
// if (config.PrimaryCurrencyId == item.Id)
// {
// item.PrimaryCurrency = true;
// }
// }
// result.Data = list;
// return new JsonResult(result);
//}
///// <summary>
///// 获取品牌详细信息
///// </summary>
///// <param name="id"></param>
///// <returns></returns>
//[HttpGet("detail")]
//public IActionResult GetManufacturer(long id)
//{
// var result = new Result<CurrencyModel>();
result.Data = list;
// var data = _dbContext.Currencies.SingleOrDefault(p => p.Id == id);
// if (data == null)
// {
// return new JsonResult(result);
// }
// var localizedList = _dbContext.LocalizedProperties.Where(p => p.EntityId == id).ToList();
return new JsonResult(result);
}
// var currency = _mapper.Map<CurrencyModel>(data);
// currency.Localized = localizedList;
/// <summary>
/// 获取货币详情
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet("detail")]
public IActionResult Get(long id)
{
var result = new ApiResult<CurrencyModel>();
// result.Data = currency;
var data = _dbContext.Currencies.SingleOrDefault(p => p.Id == id);
if (data == null)
{
return new JsonResult(result);
}
// return new JsonResult(result);
//}
var currency = _mapper.Map<CurrencyModel>(data);
///// <summary>
///// 保存货币信息
///// </summary>
///// <param name="model"></param>
///// <returns></returns>
//[HttpPost("save")]
//public async Task<IActionResult> ManufacturerEdit(CurrencyModel model)
//{
// var result = new Result<bool>();
// var validator = new CurrencyModelValidator();
// var validation = validator.Validate(model);
// if (!validation.IsValid)
// {
// result.Message = ModelState.Values.First().Errors[0].ErrorMessage;
// result.Success = false;
// return new JsonResult(result);
// }
// if (model.IsEdit && model.Id > 0)
// {
// var data = _dbContext.Currencies.SingleOrDefault(p => p.Id == model.Id);
// if (data == null)
// {
// result.Message = "数据不存在，请更换！";
// result.Success = false;
// return new JsonResult(result);
// }
result.Data = currency;
// if (model.Language.ToInt() == 0)
// {
return new JsonResult(result);
}
// data = _mapper.Map(model, data);
// data.UpdateTime = DateTime.UtcNow;
// _dbContext.SaveChanges();
// await _cacheService.GetCurrenciesById(model.Id, data);
// }
// else
// {
// var localizedList = _dbContext.LocalizedProperties.Where(p => p.LanguageNumber == model.Language.ToInt() && p.EntityId == model.Id).ToList();
// var name = nameof(model.Name);
// var nameData = localizedList.SingleOrDefault(p => p.Key == name);
// var newLocalizedList = new List<LocalizedProperty>();
// var addLocalizedList = new List<LocalizedProperty>();
// if (nameData == null)
// {
// if (!string.IsNullOrEmpty(model.Name))
// {
// nameData = new LocalizedProperty()
// {
// Id = _idCreator.NewId(),
// EntityId = model.Id,
// LanguageNumber = model.Language.ToInt(),
// Type = (int)LocalizedType.Manufacturer,
// Key = name,
// Value = model.Name
// };
// addLocalizedList.Add(nameData);
// }
// }
// else
// {
// if (!string.IsNullOrEmpty(model.Name))
// {
// nameData.Value = model.Name;
// }
// else
// {
// _dbContext.LocalizedProperties.Remove(nameData);
// }
// }
// if (nameData != null)
// {
// newLocalizedList.Add(nameData);
// }
// if (addLocalizedList.Any())
// {
// _dbContext.LocalizedProperties.AddRange(addLocalizedList);
// }
// data.Enabled = model.Enabled;
// data.DisplayOrder = model.DisplayOrder;
// data.UpdateTime = DateTime.UtcNow;
/// <summary>
/// 保存货币信息
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost("save")]
public async Task<IActionResult> ManufacturerEdit(CurrencyModel model)
{
var result = new ApiResult<bool>();
var validation = _validator.Validate(model);
if (!validation.IsValid)
{
result.Message = ModelState.Values.First().Errors[0].ErrorMessage;
result.Success = false;
return new JsonResult(result);
}
if (model.IsEdit && model.Id > 0)
{
var data = _dbContext.Currencies.SingleOrDefault(p => p.Id == model.Id);
if (data == null)
{
result.Message = "数据不存在，请更换！";
result.Success = false;
return new JsonResult(result);
}
// try
// {
data = _mapper.Map(model, data);
data.UpdateTime = DateTime.UtcNow;
_dbContext.SaveChanges();
await _cacheService.GetCurrenciesById(model.Id, data);
}
else
{
var data = _mapper.Map<Currency>(model);
data.CreateTime = DateTime.UtcNow;
// _dbContext.SaveChanges();
// }
// catch (Exception ex)
// {
// Console.WriteLine($"{ex.Message}");
// }
_dbContext.Currencies.Add(data);
_dbContext.SaveChanges();
await _cacheService.GetCurrenciesById(model.Id, data);
}
// await _cacheService.GetCurrenciesById(model.Id, data);
// await _cacheService.GetLocalizedProperty(model.Id, model.Language.ToInt(), newLocalizedList);
// }
// }
// else
// {
// var data = _mapper.Map<Currency>(model);
// var maxid = _dbContext.PaymentChannels.Max(p => p.Id);
result.Data = true;
// data.Id = maxid + 1;
// data.CreateTime = DateTime.UtcNow;
return new JsonResult(result);
}
// _dbContext.Currencies.Add(data);
// _dbContext.SaveChanges();
// await _cacheService.GetCurrenciesById(model.Id, data);
// }
/// <summary>
/// 删除制造商
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
// result.Data = true;
[HttpPost("delete")]
public async Task<IActionResult> DeleteAsync(long id)
{
var result = new ApiResult<bool>();
var data = _dbContext.Currencies.SingleOrDefault(p => p.Id == id);
if (data != null)
{
_dbContext.Currencies.Remove(data);
_dbContext.SaveChanges();
await _cacheService.RemoveCurrencies(data.Id);
}
result.Data = true;
// return new JsonResult(result);
//}
///// <summary>
///// 删除制造商
///// </summary>
///// <param name="model"></param>
///// <returns></returns>
//[HttpPost("delete")]
//public async Task<IActionResult> DeleteAsync(long id)
//{
// var result = new Result<bool>();
// var data = _dbContext.Currencies.SingleOrDefault(p => p.Id == id);
// if (data != null)
// {
// _dbContext.Currencies.Remove(data);
// _dbContext.SaveChanges();
// await _cacheService.RemoveCurrencies(data.Id);
// }
// result.Data = true;
// return new JsonResult(result);
//}
return new JsonResult(result);
}
}
}

2
Atomx.Common/Entities/Currency.cs
View File

@@ -12,7 +12,7 @@ namespace Atomx.Common.Entities
/// <summary>
/// 数据ID
/// </summary>
[DatabaseGenerated(DatabaseGeneratedOption.None)]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
[Key]
public int Id { get; set; }

289
Atomx.Data/CacheServices/CurrencyCacheService.cs
View File

@@ -3,187 +3,128 @@ using Atomx.Common.Entities;
namespace Atomx.Data.CacheServices
{
//public partial interface ICacheService
//{
// /// <summary>
// /// 获取可付款的货币类型和支付通道信息
// /// </summary>
// /// <param name="reload"></param>
// /// <returns></returns>
// Task<CurrencyChannelModel> GetCurrencyChannel(bool? reload = false);
public partial interface ICacheService
{
/// <summary>
/// 获取支持充值的货币信息
/// </summary>
/// <returns></returns>
Task<List<Currency>> GetDepositCurrencies();
// /// <summary>
// /// 获取支持充值的货币信息
// /// </summary>
// /// <returns></returns>
// Task<List<Currency>> GetDepositCurrencies();
/// <summary>
/// 获取所有可用的货币信息
/// </summary>
/// <param name="reload"></param>
/// <returns></returns>
Task<List<Currency>?> GetCurrencies(bool? reload = null);
// /// <summary>
// /// 获取所有可用的货币信息
// /// </summary>
// /// <param name="reload"></param>
// /// <returns></returns>
// Task<List<Currency>?> GetCurrencies(bool? reload = null);
/// <summary>
/// 通过ID获取或更新缓存
/// </summary>
/// <param name="id"></param>
/// <param name="data"></param>
/// <returns></returns>
Task<Currency> GetCurrenciesById(long id, Currency? data = null);
// /// <summary>
// /// 通过ID获取或更新缓存
// /// </summary>
// /// <param name="id"></param>
// /// <param name="data"></param>
// /// <returns></returns>
// Task<Currency> GetCurrenciesById(long id, Currency? data = null);
/// <summary>
/// 根据代码获取货币信息
/// </summary>
/// <param name="code"></param>
/// <returns></returns>
Task<Currency> GetCurrency(string code);
// /// <summary>
// /// 根据代码获取货币信息
// /// </summary>
// /// <param name="code"></param>
// /// <returns></returns>
// Task<Currency> GetCurrency(string code);
/// <summary>
/// 从缓存中删除数据
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
Task RemoveCurrencies(long id);
// /// <summary>
// /// 从缓存中删除数据
// /// </summary>
// /// <param name="id"></param>
// /// <returns></returns>
// Task RemoveCurrencies(long id);
}
public partial class CacheService : ICacheService
{
/// <summary>
/// 获取支持充值的货币信息
/// </summary>
/// <returns></returns>
public async Task<List<Currency>> GetDepositCurrencies()
{
var data = await GetCurrencies();
return data.Where(p => p.EnablePay).ToList();
}
//}
//public partial class CacheService : ICacheService
//{
// /// <summary>
// /// 获取可付款的货币类型和支付通道信息
// /// </summary>
// /// <param name="reload"></param>
// /// <returns></returns>
// public async Task<CurrencyChannelModel> GetCurrencyChannel(bool? reload = false)
// {
// var cacheData = await GetCacheAsync<CurrencyChannelModel>(CacheKeys.CurrencyChannel);
// bool needReload = reload.HasValue ? reload.Value : false;
// if (cacheData == null || needReload)
// {
// cacheData = new CurrencyChannelModel();
public async Task<List<Currency>?> GetCurrencies(bool? reload = null)
{
var cacheData = await GetCacheAsync<List<Currency>>(CacheKeys.Currencies);
if (cacheData == null || reload.HasValue)
{
var data = _dbContext.Currencies.Where(p => p.Enabled).ToList();
if (data != null)
{
cacheData = data;
await SetCacheAsync(CacheKeys.Currencies, cacheData);
}
}
return cacheData;
}
// var relation = _dbContext.CurrencyChannelRelations.ToList();
// var currency = _dbContext.Currencies.Where(p => p.EnablePay).ToList();
// var channels = _dbContext.PaymentChannels.Where(p => p.Status == (int)PaymentChannelStatus.Enable).ToList();
public async Task<Currency> GetCurrenciesById(long id, Currency? data = null)
{
var cacheData = await GetCurrencies();
if (data != null)
{
var currency = cacheData.SingleOrDefault(p => p.Id == id);
if (currency != null)
{
cacheData.Remove(currency);
cacheData.Add(data);
await SetCacheAsync(CacheKeys.Currencies, cacheData);
}
else
{
cacheData.Add(data);
await SetCacheAsync(CacheKeys.Currencies, cacheData);
}
return data;
}
else
{
var manufacturer = cacheData.SingleOrDefault(p => p.Id == id);
if (manufacturer != null)
{
return manufacturer;
}
return new Currency();
}
}
// cacheData.Currencies = currency;
// foreach (var item in relation)
// {
// var channel = channels.SingleOrDefault(p => p.Id == item.PayChannelId);
// if (channel != null)
// {
// var data = new CurrencyPaymentChannelModel()
// {
// Id = channel.Id,
// Config = channel.Config,
// CreateTime = channel.CreateTime,
// Description = channel.Description,
// DisplayOrder = channel.DisplayOrder,
// EndTime = item.EndTime,
// Extended = item.Extended,
// Name = channel.Name,
// Network = channel.Network,
// StartTime = item.StartTime,
// Status = channel.Status,
// TimeZone = item.TimeZone,
// Type = channel.Type,
// UpdateTime = channel.UpdateTime,
// CurrencyId = item.CurrencyId,
// Account = channel.Account,
// Title = channel.Title,
// };
// cacheData.CurrencyPaymentChannels.Add(data);
/// <summary>
/// 根据代码获取货币信息
/// </summary>
/// <param name="code"></param>
/// <returns></returns>
public async Task<Currency> GetCurrency(string code)
{
var cacheData = await GetCurrencies();
if (cacheData != null)
{
return cacheData.SingleOrDefault(p => p.CurrencyCode == code);
}
return new Currency();
}
// }
// }
// await SetCacheAsync(CacheKeys.CurrencyChannel, cacheData);
// }
// return cacheData;
// }
// /// <summary>
// /// 获取支持充值的货币信息
// /// </summary>
// /// <returns></returns>
// public async Task<List<Currency>> GetDepositCurrencies()
// {
// var data = await GetCurrencies();
// return data.Where(p => p.EnablePay).ToList();
// }
// public async Task<List<Currency>?> GetCurrencies(bool? reload = null)
// {
// var cacheData = await GetCacheAsync<List<Currency>>(CacheKeys.Currencies);
// if (cacheData == null || reload.HasValue)
// {
// var data = _dbContext.Currencies.Where(p => p.Enabled).ToList();
// if (data != null)
// {
// cacheData = data;
// await SetCacheAsync(CacheKeys.Currencies, cacheData);
// }
// }
// return cacheData;
// }
// public async Task<Currency> GetCurrenciesById(long id, Currency? data = null)
// {
// var cacheData = await GetCurrencies();
// if (data != null)
// {
// var manufacturer = cacheData.SingleOrDefault(p => p.Id == id);
// if (manufacturer != null)
// {
// cacheData.Remove(manufacturer);
// cacheData.Add(data);
// await SetCacheAsync(CacheKeys.Currencies, cacheData);
// }
// else
// {
// cacheData.Add(data);
// await SetCacheAsync(CacheKeys.Currencies, cacheData);
// }
// return data;
// }
// else
// {
// var manufacturer = cacheData.SingleOrDefault(p => p.Id == id);
// if (manufacturer != null)
// {
// return manufacturer;
// }
// return new Currency();
// }
// }
// /// <summary>
// /// 根据代码获取货币信息
// /// </summary>
// /// <param name="code"></param>
// /// <returns></returns>
// public async Task<Currency> GetCurrency(string code)
// {
// var cacheData = await GetCurrencies();
// if (cacheData != null)
// {
// return cacheData.SingleOrDefault(p => p.CurrencyCode == code);
// }
// return new Currency();
// }
// public async Task RemoveCurrencies(long id)
// {
// var cacheData = await GetCurrencies();
// if (cacheData != null)
// {
// var data = cacheData.SingleOrDefault(p => p.Id == id);
// if (data != null)
// {
// cacheData.Remove(data);
// await SetCacheAsync(CacheKeys.Currencies, cacheData);
// }
// }
// }
//}
public async Task RemoveCurrencies(long id)
{
var cacheData = await GetCurrencies();
if (cacheData != null)
{
var data = cacheData.SingleOrDefault(p => p.Id == id);
if (data != null)
{
cacheData.Remove(data);
await SetCacheAsync(CacheKeys.Currencies, cacheData);
}
}
}
}
}