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

实现了设备详情页面，并添加了在设备界面点击对应的设备直接跳转到设备详情页面

Browse Source
This commit is contained in:
David P.G
2025-07-16 18:39:00 +08:00
parent b17ee045ff
commit 76f16d50be
18 changed files with 374 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Repositories/DeviceRepository.cs
View File

@@ -150,7 +150,7 @@ public class DeviceRepository
var result = await db.Deleteable<DbDevice>(new DbDevice { Id = device.Id })
.ExecuteCommandAsync();
// 删除变量表
await _varTableRepository.Delete(device.VariableTables, db);
await _varTableRepository.DeleteAsync(device.VariableTables, db);
// 删除菜单
var menu = DataServicesHelper.FindMenusForDevice(device, menus);
@@ -228,7 +228,7 @@ public class DeviceRepository
{
// 添加默认变量表
var varTable = new VariableTable();
device.VariableTables = new List<VariableTable>();
device.VariableTables = new ();
varTable.IsActive = true;
varTable.DeviceId = addDevice.Id;
varTable.Name = "默认变量表";

2
Data/Repositories/MqttRepository.cs
View File

@@ -155,7 +155,7 @@ public class MqttRepository
var result = await db.Deleteable<DbMqtt>()
.In(mqtt.Id)
.ExecuteCommandAsync();
// Delete menu entry
// DeleteAsync menu entry
var menu = await _menuRepository.GetMenuByDataId(mqtt.Id, MenuType.MqttMenu);
if (menu!=null )
{

35
Data/Repositories/VarTableRepository.cs
View File

@@ -62,17 +62,15 @@ public class VarTableRepository
/// </summary>
/// <param name="variableTable"></param>
/// <returns></returns>
public async Task<int> Edit(VariableTable variableTable)
public async Task<int> UpdateAsync(VariableTable variableTable)
{
Stopwatch stopwatch = new Stopwatch();
stopwatch.Start();
using (var db = DbContext.GetInstance())
{
var result = await Edit(variableTable, db);
stopwatch.Stop();
NlogHelper.Info($"编辑变量表 '{variableTable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
return result;
}
using var db = DbContext.GetInstance();
var result = await UpdateAsync(variableTable, db);
stopwatch.Stop();
NlogHelper.Info($"编辑变量表 '{variableTable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
return result;
}
/// <summary>
@@ -80,7 +78,7 @@ public class VarTableRepository
/// </summary>
/// <param name="variableTable"></param>
/// <returns></returns>
public async Task<int> Edit(VariableTable variableTable, SqlSugarClient db)
public async Task<int> UpdateAsync(VariableTable variableTable, SqlSugarClient db)
{
Stopwatch stopwatch = new Stopwatch();
stopwatch.Start();
@@ -96,13 +94,13 @@ public class VarTableRepository
/// </summary>
/// <param name="variableTable"></param>
/// <returns></returns>
public async Task<int> Delete(VariableTable variableTable)
public async Task<int> DeleteAsync(VariableTable variableTable)
{
Stopwatch stopwatch = new Stopwatch();
stopwatch.Start();
using (var db = DbContext.GetInstance())
{
var result = await Delete(variableTable, db);
var result = await DeleteAsync(variableTable, db);
stopwatch.Stop();
NlogHelper.Info($"删除变量表 '{variableTable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
return result;
@@ -114,7 +112,7 @@ public class VarTableRepository
/// </summary>
/// <param name="deviceVariableTables"></param>
/// <param name="db"></param>
public async Task<int> Delete(VariableTable varTable, SqlSugarClient db)
public async Task<int> DeleteAsync(VariableTable varTable, SqlSugarClient db)
{
if (varTable == null )
return 0;
@@ -133,9 +131,9 @@ public class VarTableRepository
/// </summary>
/// <param name="deviceVariableTables"></param>
/// <param name="db"></param>
public async Task Delete(List<VariableTable> deviceVariableTables, SqlSugarClient db)
public async Task DeleteAsync(IEnumerable<VariableTable> deviceVariableTables, SqlSugarClient db)
{
if (deviceVariableTables == null || deviceVariableTables.Count == 0)
if (deviceVariableTables == null || deviceVariableTables.Count() == 0)
return;
// 转换对象
var dbList = deviceVariableTables.Select(v => _mapper.Map<DbVariableTable>(v))
@@ -143,4 +141,13 @@ public class VarTableRepository
await db.Deleteable<DbVariableTable>(dbList)
.ExecuteCommandAsync();
}
public async Task<VariableTable> AddAsync(VariableTable varTable)
{
using var db = DbContext.GetInstance();
return await Add(varTable);
}
}