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

按照软件设计文档开始重构代码01

Browse Source
This commit is contained in:
David P.G
2025-07-21 14:35:17 +08:00
parent a7b0a5d108
commit 29a2d44319
127 changed files with 12265 additions and 1586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DMS.Infrastructure/Services/DatabaseInitializerService.cs
View File

@@ -28,8 +28,8 @@ namespace DMS.Infrastructure.Services
_db.CodeFirst.InitTables<DbVariable>();
_db.CodeFirst.InitTables<DbVariableHistory>();
_db.CodeFirst.InitTables<DbUser>();
_db.CodeFirst.InitTables<DbMqtt>();
_db.CodeFirst.InitTables<DbVariableMqtt>();
_db.CodeFirst.InitTables<DbMqttServer>();
_db.CodeFirst.InitTables<DbVariableMqttAlias>();
_db.CodeFirst.InitTables<DbMenu>();
}
@@ -41,12 +41,12 @@ namespace DMS.Infrastructure.Services
return Task.CompletedTask;
}
settings.Menus.Add(new MenuBean() { Id=1, Name = "主页", Type = MenuType.MainMenu, Icon = "Home", ParentId = 0 });
settings.Menus.Add(new MenuBean() { Id = 2, Name = "设备", Type = MenuType.MainMenu, Icon = "Devices3", ParentId = 0 });
settings.Menus.Add(new MenuBean() { Id = 3, Name = "数据转换", Type = MenuType.MainMenu, Icon = "ChromeSwitch", ParentId = 0 });
settings.Menus.Add(new MenuBean() { Id = 4, Name = "Mqtt服务器", Type = MenuType.MainMenu, Icon = "Cloud", ParentId = 0 });
settings.Menus.Add(new MenuBean() { Id = 5, Name = "设置", Type = MenuType.MainMenu, Icon = "Settings", ParentId = 0 });
settings.Menus.Add(new MenuBean() { Id = 6, Name = "关于", Type = MenuType.MainMenu, Icon = "Info", ParentId = 0 });
settings.Menus.Add(new MenuBean() { Id=1, Header = "主页", Icon = "Home", ParentId = 0 });
settings.Menus.Add(new MenuBean() { Id = 2, Header = "设备", Icon = "Devices3", ParentId = 0 });
settings.Menus.Add(new MenuBean() { Id = 3, Header = "数据转换", Icon = "ChromeSwitch", ParentId = 0 });
settings.Menus.Add(new MenuBean() { Id = 4, Header = "Mqtt服务器", Icon = "Cloud", ParentId = 0 });
settings.Menus.Add(new MenuBean() { Id = 5, Header = "设置", Icon = "Settings", ParentId = 0 });
settings.Menus.Add(new MenuBean() { Id = 6, Header = "关于", Icon = "Info", ParentId = 0 });
settings.Save();

10
DMS.Infrastructure/Services/DeviceService.cs
View File

@@ -44,11 +44,11 @@ namespace DMS.Infrastructure.Services
stopwatch.Start();
var dbList = await GetAllAsync();
//查询设备的名字是否存在
if (dbList.Any(d => d.Name == device.Name || (d.Ip == device.Ip && d.Prot == device.Prot) || d.OpcUaEndpointUrl == device.OpcUaEndpointUrl))
{
NlogHelper.Warn("设备的名称，Ip:端口，OpcUrl,不可以重复。");
return resDevice;
}
// if (dbList.Any(d => d.Name == device.Name || (d.Ip == device.Ip && d.Prot == device.Prot) || d.OpcUaEndpointUrl == device.OpcUaEndpointUrl))
// {
// NlogHelper.Warn("设备的名称，Ip:端口，OpcUrl,不可以重复。");
// return resDevice;
// }
// 2. 将设备添加到数据库
var addDevice = await _deviceRepository.AddAsync(_mapper.Map<DbDevice>(device));

2
DMS.Infrastructure/Services/MqttService.cs
View File

@@ -14,7 +14,7 @@ using System.Threading.Tasks;
namespace DMS.Infrastructure.Services
{
public class MqttService:BaseService<Mqtt, DbMqtt, MqttRepository>
public class MqttService:BaseService<MqttServer, DbMqttServer, MqttRepository>
{
public MqttService(IMapper mapper, MqttRepository repository) : base(mapper, repository)
{