xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 在 AppSettings 类中添加了 DefaultPollingInterval 属性，用于存储全局默认轮询间隔值

Browse Source 
2. 更新了 SettingViewModel 以包含对轮询间隔设置的支持，允许用户在设置页面中修改该值
   3. 修改了 VariableItemViewModel，使其在初始化时从 AppSettings 加载默认轮询间隔值
   4. 更新了 SettingView.xaml，在设置页面的"通用设置"部分添加了轮询间隔配置项
This commit is contained in:
David P.G
2025-10-02 12:35:42 +08:00
parent 6e9f7c4a44
commit 1a666b79c8
6 changed files with 181 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DMS.Infrastructure/Configurations/AppSettings.cs
View File

@@ -1,3 +1,4 @@
using AutoMapper;
using DMS.Core.Models; using DMS.Core.Models;
using Newtonsoft.Json; using Newtonsoft.Json;
@@ -15,6 +16,10 @@ namespace DMS.Infrastructure.Configurations
public class AppSettings public class AppSettings
{ {
private readonly IMapper _mapper;
public DatabaseSettings Database { get; set; } = new DatabaseSettings(); public DatabaseSettings Database { get; set; } = new DatabaseSettings();
public string Theme { get; set; } = "跟随系统"; public string Theme { get; set; } = "跟随系统";
public bool EnableS7Service { get; set; } = true; public bool EnableS7Service { get; set; } = true;
@@ -22,15 +27,18 @@ namespace DMS.Infrastructure.Configurations
public bool EnableOpcUaService { get; set; } = true; public bool EnableOpcUaService { get; set; } = true;
public bool MinimizeToTrayOnClose { get; set; } = true; public bool MinimizeToTrayOnClose { get; set; } = true;
public List<MenuBean> Menus { get; set; } = new List<MenuBean>(); public List<MenuBean> Menus { get; set; } = new List<MenuBean>();
public int DefaultPollingInterval { get; set; } = 30000; // 默认轮询间隔30秒
private static readonly string SettingsFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "appSettings.json"); private static readonly string SettingsFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "appSettings.json");
public static AppSettings Load() public AppSettings Load()
{ {
if (File.Exists(SettingsFilePath)) if (File.Exists(SettingsFilePath))
{ {
string json = File.ReadAllText(SettingsFilePath); string json = File.ReadAllText(SettingsFilePath);
return JsonConvert.DeserializeObject<AppSettings>(json); AppSettings appSettings = JsonConvert.DeserializeObject<AppSettings>(json);
return appSettings;
} }
return new AppSettings(); return new AppSettings();
} }

3
DMS.WPF/Profiles/MappingProfile.cs
View File

@@ -28,7 +28,8 @@ namespace DMS.WPF.Profiles
CreateMap<MqttServer, MqttServerItemViewModel>().ReverseMap(); CreateMap<MqttServer, MqttServerItemViewModel>().ReverseMap();
CreateMap<UserDto, UserItemViewModel>().ReverseMap(); CreateMap<UserDto, UserItemViewModel>().ReverseMap();
CreateMap<VariableHistoryDto, VariableHistoryItemViewModel>().ReverseMap(); CreateMap<VariableHistoryDto, VariableHistoryItemViewModel>().ReverseMap();
CreateMap<VariableDto, VariableItemViewModel>().ReverseMap(); CreateMap<VariableDto, VariableItemViewModel>()
.ReverseMap();
CreateMap<VariableMqttAliasDto, VariableMqttAliasItemViewModel>().ReverseMap(); CreateMap<VariableMqttAliasDto, VariableMqttAliasItemViewModel>().ReverseMap();
CreateMap<VariableTableDto, VariableTableItemViewModel>().ReverseMap(); CreateMap<VariableTableDto, VariableTableItemViewModel>().ReverseMap();
CreateMap<NlogDto, NlogItemViewModel>().ReverseMap(); CreateMap<NlogDto, NlogItemViewModel>().ReverseMap();

12
DMS.WPF/ViewModels/Items/VariableItemViewModel.cs
View File

@@ -3,6 +3,8 @@ using DMS.Application.DTOs;
using DMS.Core.Enums; using DMS.Core.Enums;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using DMS.Infrastructure.Configurations;
using Microsoft.Extensions.DependencyInjection;
namespace DMS.WPF.ViewModels.Items; namespace DMS.WPF.ViewModels.Items;
@@ -116,7 +118,15 @@ public partial class VariableItemViewModel : ObservableObject
/// 用于决定数据采集的频率。 /// 用于决定数据采集的频率。
/// </summary> /// </summary>
[ObservableProperty] [ObservableProperty]
private int _pollingInterval = 30000; // ThirtySeconds private int _pollingInterval;
public VariableItemViewModel()
{
// 使用默认值，实际的默认值应该从外部传入或通过其他方式设置
// 保持构造函数轻量级，不加载配置文件
_pollingInterval = App.Current.Services.GetRequiredService<AppSettings>().DefaultPollingInterval; // 默认值，可通过外部设置覆盖
}
/// <summary> /// <summary>
/// 获取或设置一个值，该值指示此变量是否被激活。 /// 获取或设置一个值，该值指示此变量是否被激活。

272
DMS.WPF/ViewModels/SettingViewModel.cs
View File

@@ -1,151 +1,173 @@
using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Input;
using DMS.Infrastructure.Configurations;
using DMS.WPF.Helper; using DMS.WPF.Helper;
using DMS.WPF.Interfaces;
namespace DMS.WPF.ViewModels; namespace DMS.WPF.ViewModels;
public partial class SettingViewModel : ViewModelBase public partial class SettingViewModel : ViewModelBase
{ {
// private AppSettings _settings; private AppSettings _settings;
private readonly INotificationService _notificationService;
public SettingViewModel() public SettingViewModel(AppSettings appSettings,INotificationService notificationService)
{ {
// _settings = AppSettings.Load(); _settings = appSettings;
// AvailableDbTypes = Enum.GetNames(typeof(SqlSugar.DbType)).ToList(); _notificationService = notificationService;
// Themes = new List<string> { "浅色", "深色", "跟随系统" }; AvailableDbTypes = Enum.GetNames(typeof(SqlSugar.DbType)).ToList();
// this.transaction = transaction; Themes = new List<string> { "浅色", "深色", "跟随系统" };
} }
public List<string> Themes { get; } public List<string> Themes { get; }
// public string SelectedTheme public string SelectedTheme
// { {
// get => _settings.Theme; get => _settings.Theme;
// set set
// { {
// if (_settings.Theme != value) if (_settings.Theme != value)
// { {
// _settings.Theme = value; _settings.Theme = value;
// OnPropertyChanged(); OnPropertyChanged();
// _settings.Save(); _settings.Save();
// ThemeHelper.ApplyTheme(value); ThemeHelper.ApplyTheme(value);
// } }
// } }
// } }
public List<string> AvailableDbTypes { get; set; } public List<string> AvailableDbTypes { get; set; }
// public string SelectedDbType public string SelectedDbType
// { {
// get => _settings.Database.DbType; get => _settings.Database.DbType;
// set set
// { {
// if (_settings.Database.DbType != value) if (_settings.Database.DbType != value)
// { {
// _settings.Database.DbType = value; _settings.Database.DbType = value;
// OnPropertyChanged(); OnPropertyChanged();
// _settings.Save(); _settings.Save();
// } }
// } }
// } }
// public string Server public string Server
// { {
// get => _settings.Database.Server; get => _settings.Database.Server;
// set set
// { {
// if (_settings.Database.Server != value) if (_settings.Database.Server != value)
// { {
// _settings.Database.Server = value; _settings.Database.Server = value;
// OnPropertyChanged(); OnPropertyChanged();
// _settings.Save(); _settings.Save();
// } }
// } }
// } }
// public int Port public int Port
// { {
// get => _settings.Database.Port; get => _settings.Database.Port;
// set set
// { {
// if (_settings.Database.Port != value) if (_settings.Database.Port != value)
// { {
// _settings.Database.Port = value; _settings.Database.Port = value;
// OnPropertyChanged(); OnPropertyChanged();
// _settings.Save(); _settings.Save();
// } }
// } }
// } }
// public string UserId public string UserId
// { {
// get => _settings.Database.UserId; get => _settings.Database.UserId;
// set set
// { {
// if (_settings.Database.UserId != value) if (_settings.Database.UserId != value)
// { {
// _settings.Database.UserId = value; _settings.Database.UserId = value;
// OnPropertyChanged(); OnPropertyChanged();
// _settings.Save(); _settings.Save();
// } }
// } }
// } }
//
// public string Password public string Password
// { {
// get => _settings.Database.Password; get => _settings.Database.Password;
// set set
// { {
// if (_settings.Database.Password != value) if (_settings.Database.Password != value)
// { {
// _settings.Database.Password = value; _settings.Database.Password = value;
// OnPropertyChanged(); OnPropertyChanged();
// _settings.Save(); _settings.Save();
// } }
// } }
// } }
//
// public string Database public string Database
// { {
// get => _settings.Database.Database; get => _settings.Database.Database;
// set set
// { {
// if (_settings.Database.Database != value) if (_settings.Database.Database != value)
// { {
// _settings.Database.Database = value; _settings.Database.Database = value;
// OnPropertyChanged(); OnPropertyChanged();
// _settings.Save(); _settings.Save();
// } }
// } }
// } }
// public bool MinimizeToTrayOnClose public bool MinimizeToTrayOnClose
// { {
// get => _settings.MinimizeToTrayOnClose; get => _settings.MinimizeToTrayOnClose;
// set set
// { {
// if (_settings.MinimizeToTrayOnClose != value) if (_settings.MinimizeToTrayOnClose != value)
// { {
// _settings.MinimizeToTrayOnClose = value; _settings.MinimizeToTrayOnClose = value;
// OnPropertyChanged(nameof(MinimizeToTrayOnClose)); OnPropertyChanged(nameof(MinimizeToTrayOnClose));
// _settings.Save(); _settings.Save();
// } }
// } }
// } }
public int DefaultPollingInterval
{
get => _settings.DefaultPollingInterval;
set
{
if (_settings.DefaultPollingInterval != value)
{
_settings.DefaultPollingInterval = value;
OnPropertyChanged();
_settings.Save();
}
}
}
[RelayCommand] [RelayCommand]
private async Task TestConnection() private async Task TestConnection()
{ {
// try try
// { {
// using (var db = transaction.GetInstance()) // 使用当前配置测试数据库连接
// { using var db = new SqlSugar.SqlSugarScope(new SqlSugar.ConnectionConfig()
// await db.Ado.OpenAsync(); {
// NotificationHelper.ShowSuccess("连接成功！"); DbType = (SqlSugar.DbType)Enum.Parse(typeof(SqlSugar.DbType), _settings.Database.DbType),
// } ConnectionString = _settings.ToConnectionString(),
// } IsAutoCloseConnection = true
// catch (Exception ex) });
// {
// NotificationHelper.ShowError($"连接失败：{ex.Message}", ex); await db.Ado.ExecuteCommandAsync("SELECT 1");
// } _notificationService.ShowSuccess("连接成功！");
}
catch (Exception ex)
{
_notificationService.ShowError($"连接失败：{ex.Message}", ex);
}
} }
} }

7
DMS.WPF/ViewModels/SplashViewModel.cs
View File

@@ -8,6 +8,7 @@ using System;
using System.Data; using System.Data;
using System.Threading.Tasks; using System.Threading.Tasks;
using DMS.Application.Services; using DMS.Application.Services;
using DMS.Infrastructure.Configurations;
using DMS.WPF.Helper; using DMS.WPF.Helper;
using DMS.WPF.Interfaces; using DMS.WPF.Interfaces;
using DMS.WPF.Views; using DMS.WPF.Views;
@@ -26,18 +27,20 @@ public partial class SplashViewModel : ObservableObject
private readonly IInitializeService _initializeService; private readonly IInitializeService _initializeService;
private readonly IDataEventService _dataEventService; private readonly IDataEventService _dataEventService;
private readonly IAppDataCenterService _appDataCenterService; private readonly IAppDataCenterService _appDataCenterService;
private readonly AppSettings _appSettings;
[ObservableProperty] [ObservableProperty]
private string _loadingMessage = "正在加载..."; private string _loadingMessage = "正在加载...";
public SplashViewModel(ILogger<SplashViewModel> logger,IServiceProvider serviceProvider, IInitializeService initializeService,IDataEventService dataEventService, public SplashViewModel(ILogger<SplashViewModel> logger,IServiceProvider serviceProvider, IInitializeService initializeService,IDataEventService dataEventService,
IAppDataCenterService appDataCenterService) IAppDataCenterService appDataCenterService,AppSettings appSettings)
{ {
_logger = logger; _logger = logger;
_serviceProvider = serviceProvider; _serviceProvider = serviceProvider;
_initializeService = initializeService; _initializeService = initializeService;
_dataEventService = dataEventService; _dataEventService = dataEventService;
this._appDataCenterService = appDataCenterService; this._appDataCenterService = appDataCenterService;
_appSettings = appSettings;
} }
/// <summary> /// <summary>
@@ -52,6 +55,8 @@ public partial class SplashViewModel : ObservableObject
_initializeService.InitializeTables(); _initializeService.InitializeTables();
_initializeService.InitializeMenus(); _initializeService.InitializeMenus();
LoadingMessage = "正在加载系统配置..."; LoadingMessage = "正在加载系统配置...";
await _appDataCenterService.DataLoaderService.LoadAllDataToMemoryAsync(); await _appDataCenterService.DataLoaderService.LoadAllDataToMemoryAsync();
// 可以在这里添加加载配置的逻辑 // 可以在这里添加加载配置的逻辑

5
DMS.WPF/Views/SettingView.xaml
View File

@@ -26,6 +26,11 @@
IsClickEnabled="True"> IsClickEnabled="True">
<ui:ToggleSwitch IsOn="{Binding MinimizeToTrayOnClose, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" /> <ui:ToggleSwitch IsOn="{Binding MinimizeToTrayOnClose, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
</ui:SettingsCard> </ui:SettingsCard>
<ui:SettingsCard Header="默认轮询间隔"
Description="设置变量的默认轮询间隔时间（毫秒）">
<TextBox Width="120"
Text="{Binding DefaultPollingInterval, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
</ui:SettingsCard>
</ui:SettingsExpander.Items> </ui:SettingsExpander.Items>
</ui:SettingsExpander> </ui:SettingsExpander>