1 refactor(config): 将AppSettings移至Application层并更新配置结构
2
3 - 将AppSettings从DMS.Infrastructure移至DMS.Application
4 - 将DatabaseSettings重命名为AppSettings.Database并更新所有引用
5 - 将配置文件从appSettings.json更改为dms_config.json
6 - 更新所有项目引用以使用新的AppSettings命名空间
7 - 移除DI容器中的SqlSugarDbContext直接实例化
8 - 添加Material Design Icons字体并更新设置视图UI
9 - 通过移除不必要的变量映射更新来优化S7服务
10 - 将数据库连接字符串属性名从Database更新为DbName
This commit is contained in:
@@ -26,4 +26,8 @@
|
||||
<ProjectReference Include="..\DMS.Core\DMS.Core.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Configurations\" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using DMS.Infrastructure.Configurations;
|
||||
using DMS.Application.Configurations;
|
||||
using SqlSugar;
|
||||
|
||||
namespace DMS.Infrastructure.Data;
|
||||
@@ -16,7 +16,7 @@ public class SqlSugarDbContext
|
||||
public SqlSugarClient GetInstance()
|
||||
{
|
||||
var connectionString = _settings.ToConnectionString();
|
||||
var dbType = (SqlSugar.DbType)Enum.Parse(typeof(SqlSugar.DbType), _settings.Database.DbType);
|
||||
var dbType = (SqlSugar.DbType)Enum.Parse(typeof(SqlSugar.DbType), _settings.Db.DbType);
|
||||
|
||||
return new SqlSugarClient(new ConnectionConfig
|
||||
{
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
using DMS.Core.Enums;
|
||||
using DMS.Core.Interfaces.Repositories;
|
||||
using DMS.Core.Models;
|
||||
using DMS.Infrastructure.Configurations;
|
||||
using DMS.Infrastructure.Data;
|
||||
using DMS.Infrastructure.Entities;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
@@ -426,18 +426,6 @@ namespace DMS.Infrastructure.Services.S7
|
||||
// 如果变量的S7相关属性发生变化
|
||||
switch (e.PropertyType)
|
||||
{
|
||||
case VariablePropertyType.S7Address:
|
||||
// S7地址变化,需要更新设备上下文中的变量映射
|
||||
if (_deviceContexts.TryGetValue(e.Variable.VariableTable.DeviceId, out var context))
|
||||
{
|
||||
// 先移除旧地址的变量
|
||||
context.Variables.Remove(e.Variable.S7Address, out _);
|
||||
// 添加新地址的变量
|
||||
context.Variables.AddOrUpdate(e.Variable.S7Address, e.Variable, (key, oldValue) => e.Variable);
|
||||
_logger.LogInformation("已更新设备 {DeviceId} 中变量 {VariableId} 的S7地址映射",
|
||||
e.Variable.VariableTable.DeviceId, e.Variable.Id);
|
||||
}
|
||||
break;
|
||||
|
||||
case VariablePropertyType.IsActive:
|
||||
// 变量激活状态变化,更新变量列表
|
||||
|
||||
Reference in New Issue
Block a user