持久层重构为独立 MiGu.DB 工程并优化集成
- 新增 MiGu.DB 项目,迁移所有领域实体与枚举,统一模型约定 - 实现 Entity/Repository/UoW/Provider/Exception 等接口与实现 - 支持数据修补机制,完善 Sqlite 初始迁移与数据库管理 - Server 侧移除 EF Core 相关,依赖 MiGu.DB,PlatformPersistence 适配 - 业务服务注入 UoW/Repository,状态字段统一用 enum 及辅助类 - 统一异常处理,Controller 映射 HTTP 状态码 - 配置项与文档补充数据库启动、SchemaMode、迁移说明 - 新增 GlobalUsings.Db.cs、WmsStatusAliases.cs 简化类型引用 - 新增 HttpActorContextMiddleware 支持操作者上下文一致性 - 新增 MiGuDbContextModelSnapshot 追踪数据库结构 - 优化代码结构,解耦领域与持久层,提升扩展性与安全性
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using MiGu.DB.Abstractions.Exceptions;
|
||||
using MiGu.DB.Abstractions.Persistence;
|
||||
using MiGu.Server.Persistence;
|
||||
|
||||
namespace MiGu.Server.Wms;
|
||||
@@ -6,14 +8,26 @@ namespace MiGu.Server.Wms;
|
||||
public sealed class WmsTransportRuleService
|
||||
{
|
||||
private readonly PlatformDbContext _db;
|
||||
private readonly IEditableRepository<WmsTransportRule> _rules;
|
||||
private readonly IUnitOfWork _uow;
|
||||
|
||||
public WmsTransportRuleService(PlatformDbContext db) => _db = db;
|
||||
public WmsTransportRuleService(
|
||||
PlatformDbContext db,
|
||||
IEditableRepository<WmsTransportRule> rules,
|
||||
IUnitOfWork uow)
|
||||
{
|
||||
_db = db;
|
||||
_rules = rules;
|
||||
_uow = uow;
|
||||
}
|
||||
|
||||
public Task<List<WmsTransportRule>> ListAsync(string? triggerType = null, string? q = null)
|
||||
{
|
||||
var query = _db.WmsTransportRules.AsNoTracking().OrderByDescending(x => x.Priority).ThenBy(x => x.Code).AsQueryable();
|
||||
if (!string.IsNullOrWhiteSpace(triggerType))
|
||||
query = query.Where(x => x.TriggerType == triggerType);
|
||||
if (!string.IsNullOrWhiteSpace(triggerType) &&
|
||||
Enum.TryParse<WmsTransportTriggerType>(triggerType.Trim(), true, out var tt) &&
|
||||
WmsTransportTriggerTypes.All.Contains(tt))
|
||||
query = query.Where(x => x.TriggerType == tt);
|
||||
if (!string.IsNullOrWhiteSpace(q))
|
||||
{
|
||||
var s = q.Trim();
|
||||
@@ -24,12 +38,12 @@ public sealed class WmsTransportRuleService
|
||||
|
||||
public async Task<WmsTransportRule> SaveAsync(TransportRuleRequest req, string actor)
|
||||
{
|
||||
if (!WmsTransportTriggerTypes.All.Contains(req.TriggerType))
|
||||
if (!WmsTransportTriggerTypes.IsDefined(req.TriggerType))
|
||||
throw new InvalidOperationException("触发类型无效");
|
||||
|
||||
WmsTransportRule entity;
|
||||
if (req.Id.HasValue)
|
||||
entity = await FindEditable(req.Id.Value, req.Version);
|
||||
entity = await _rules.GetEditableAsync(req.Id.Value, req.Version);
|
||||
else
|
||||
{
|
||||
entity = new WmsTransportRule();
|
||||
@@ -37,44 +51,24 @@ public sealed class WmsTransportRuleService
|
||||
_db.WmsTransportRules.Add(entity);
|
||||
}
|
||||
|
||||
await EnsureUniqueCode(req.Code, entity.Id);
|
||||
await _rules.EnsureUniqueAsync(x => x.Code == req.Code.Trim() && x.Id != entity.Id, "规则编码已存在");
|
||||
entity.Code = req.Code.Trim();
|
||||
entity.Name = req.Name.Trim();
|
||||
entity.TriggerType = req.TriggerType.Trim();
|
||||
entity.TriggerType = WmsTransportTriggerTypes.ParseOr(req.TriggerType);
|
||||
entity.Enabled = req.Enabled;
|
||||
entity.Priority = req.Priority;
|
||||
entity.SourceSelectorJson = TransportSelectorParser.NormalizeSelectorJson(req.SourceSelectorJson);
|
||||
entity.TargetSelectorJson = TransportSelectorParser.NormalizeSelectorJson(req.TargetSelectorJson);
|
||||
entity.TaskOptionsJson = TransportSelectorParser.NormalizeTaskOptionsJson(req.TaskOptionsJson);
|
||||
ApplyCommon(entity, req, actor);
|
||||
await _db.SaveChangesAsync();
|
||||
await _uow.SaveChangesAsync();
|
||||
return entity;
|
||||
}
|
||||
|
||||
public async Task DeleteAsync(Guid id, long? version, string actor)
|
||||
{
|
||||
var entity = await FindEditable(id, version);
|
||||
entity.IsDeleted = true;
|
||||
entity.DeletedAt = DateTimeOffset.UtcNow;
|
||||
entity.DeletedBy = actor;
|
||||
entity.UpdatedBy = actor;
|
||||
await _db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
private async Task<WmsTransportRule> FindEditable(Guid id, long? version)
|
||||
{
|
||||
var entity = await _db.WmsTransportRules.FirstOrDefaultAsync(x => x.Id == id)
|
||||
?? throw new InvalidOperationException("规则不存在");
|
||||
if (version.HasValue && entity.Version != version.Value)
|
||||
throw new InvalidOperationException("数据已被其他用户修改,请刷新后重试");
|
||||
if (entity.IsLock) throw new InvalidOperationException("规则已锁定,不能修改");
|
||||
return entity;
|
||||
}
|
||||
|
||||
private async Task EnsureUniqueCode(string code, Guid id)
|
||||
{
|
||||
if (await _db.WmsTransportRules.AnyAsync(x => x.Code == code.Trim() && x.Id != id))
|
||||
throw new InvalidOperationException("规则编码已存在");
|
||||
await _rules.SoftDeleteAsync(id, version);
|
||||
await _uow.SaveChangesAsync();
|
||||
}
|
||||
|
||||
private static void StampCreate(EntityBase entity, string actor)
|
||||
|
||||
Reference in New Issue
Block a user