新增物料类型处理逻辑,确保在保存和编辑称重记录时自动设置默认物料类型。更新前端表单以支持密炼物料的选择和显示,优化用户体验。添加分类字典和数据字典的事件广播功能,增强系统的实时数据同步能力。

This commit is contained in:
geht
2026-05-07 17:53:48 +08:00
parent ce9dc8efd8
commit f60a4fb203
55 changed files with 2968 additions and 375 deletions

View File

@@ -0,0 +1,80 @@
using Prism.Events;
using System.Text.Json;
using YY.Admin.Core;
using YY.Admin.Core.Events;
using YY.Admin.Core.Services;
namespace YY.Admin.Services.Service.Dict;
public class DictSyncCoordinator : ISingletonDependency
{
private readonly IEventAggregator _eventAggregator;
private readonly IJeecgDictSyncService _dictSyncService;
private readonly ILoggerService _logger;
public DictSyncCoordinator(
IEventAggregator eventAggregator,
IJeecgDictSyncService dictSyncService,
ILoggerService logger)
{
_eventAggregator = eventAggregator;
_dictSyncService = dictSyncService;
_logger = logger;
_eventAggregator.GetEvent<RemoteCommandReceivedEvent>()
.Subscribe(OnRemoteCommand, ThreadOption.BackgroundThread);
_eventAggregator.GetEvent<NetworkStatusChangedEvent>()
.Subscribe(OnNetworkStatusChanged, ThreadOption.BackgroundThread);
_logger.Information("[数据字典] DictSyncCoordinator 已启动");
_ = Task.Run(() => SyncAndPublishAsync("startup", null));
}
private void OnNetworkStatusChanged(NetworkStatusChangedPayload payload)
{
if (!payload.IsOnline) return;
_logger.Information("[数据字典] 网络恢复,触发补偿刷新");
_ = Task.Run(() => SyncAndPublishAsync("reconnect", null));
}
private void OnRemoteCommand(RemoteCommandPayload payload)
{
try
{
var json = payload.CommandJson ?? string.Empty;
if (string.IsNullOrWhiteSpace(json)) return;
using var doc = JsonDocument.Parse(json);
if (!doc.RootElement.TryGetProperty("cmd", out var cmdEl)) return;
if (!cmdEl.GetString().Equals("SYS_DICT_CHANGED", StringComparison.OrdinalIgnoreCase)) return;
doc.RootElement.TryGetProperty("action", out var actionEl);
doc.RootElement.TryGetProperty("dictId", out var idEl);
var action = actionEl.GetString() ?? string.Empty;
var dictId = idEl.ValueKind == JsonValueKind.String ? idEl.GetString() : null;
_logger.Information($"[数据字典] 收到变更信号 action={action}");
_ = Task.Run(() => SyncAndPublishAsync(action, dictId));
}
catch (Exception ex)
{
_logger.Warning($"[数据字典] 处理STOMP命令失败{ex.Message}");
}
}
private async Task SyncAndPublishAsync(string action, string? dictId)
{
try
{
var count = await _dictSyncService.SyncFromJeecgAsync().ConfigureAwait(false);
if (count > 0)
_logger.Information($"[数据字典] 同步完成,共处理 {count} 条");
_eventAggregator.GetEvent<DictChangedEvent>()
.Publish(new DictChangedPayload { Action = action, DictId = dictId });
}
catch (Exception ex)
{
_logger.Warning($"[数据字典] 同步失败:{ex.Message}");
}
}
}