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-06-30 20:11:21 +08:00
parent a64065fdda
commit a1de03a94e
7 changed files with 119 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Data/Repositories/MenuRepository.cs
View File

@@ -24,14 +24,34 @@ public class MenuRepository
{
// //无主键用法新:5.1.4.110
// db.Queryable<Tree>().ToTree(it=>it.Child,it=>it.ParentId,0,it=>it.Id)//+4重载
List<MenuBean> menus = new();
var dbMenuList = await _db.Queryable<DbMenu>().ToTreeAsync(dm => dm.Items, dm => dm.ParentId, 0);
foreach (var item in dbMenuList)
List<DbMenu> dbMenuList = await _db.Queryable<DbMenu>().ToListAsync();
List<MenuBean> menuTree = new();
var dbMenuTree = await _db.Queryable<DbMenu>().ToTreeAsync(dm => dm.Items, dm => dm.ParentId, 0);
foreach (var dbMenu in dbMenuTree)
{
menus.Add(item.CopyTo<MenuBean>());
AddParent(dbMenu);
menuTree.Add(dbMenu.CopyTo<MenuBean>());
}
return menus;
return menuTree;
}
private void AddParent(DbMenu dbMenu)
{
if (dbMenu.Items == null || dbMenu.Items.Count == 0)
return;
foreach (var item in dbMenu.Items)
{
item.Parent = dbMenu;
if (item.Items!=null && item.Items.Count>0)
{
AddParent(item);
}
}
}
public async Task<int> AddMenu(MenuBean menu)
@@ -46,7 +66,7 @@ public class MenuRepository
var deviceMainMenu = await _db.Queryable<DbMenu>().FirstAsync(m => m.Name == "设备");
if (deviceMainMenu == null)
throw new InvalidOperationException("没有找到设备菜单！！");
// 添加菜单项
MenuBean menu = new MenuBean()
{
@@ -56,16 +76,17 @@ public class MenuRepository
Icon = SegoeFluentIcons.Devices4.Glyph,
};
menu.ParentId=deviceMainMenu.Id;
menu.ParentId = deviceMainMenu.Id;
var addDeviceMenuId = await _db.Insertable<DbMenu>(menu.CopyTo<DbMenu>())
.ExecuteReturnIdentityAsync();
if (addDeviceMenuId == 0)
throw new InvalidOperationException($"{menu.Name},设备菜单添加失败！！");
var defVarTable= await _db.Queryable<DbVariableTable>().FirstAsync(v=>v.DeviceId==device.Id && v.Name=="默认变量表");
if (defVarTable == null)
throw new InvalidOperationException($"没有找到{device.Name}的默认变量表。");
var defVarTableMenu=new MenuBean()
var defVarTable = await _db.Queryable<DbVariableTable>()
.FirstAsync(v => v.DeviceId == device.Id && v.Name == "默认变量表");
if (defVarTable == null)
throw new InvalidOperationException($"没有找到{device.Name}的默认变量表。");
var defVarTableMenu = new MenuBean()
{
Name = "默认变量表",
Icon = SegoeFluentIcons.Tablet.Glyph,
@@ -73,7 +94,7 @@ public class MenuRepository
ParentId = addDeviceMenuId,
DataId = defVarTable.Id
};
var addVarTable=new MenuBean()
var addVarTable = new MenuBean()
{
Name = "添加变量表",
Icon = SegoeFluentIcons.Add.Glyph,
@@ -82,14 +103,14 @@ public class MenuRepository
};
var defTableRes = await _db.Insertable<DbMenu>(defVarTableMenu).ExecuteCommandAsync();
var addTableRes = await _db.Insertable<DbMenu>(addVarTable).ExecuteCommandAsync();
if ((addTableRes+defTableRes) != 2)
if ((addTableRes + defTableRes) != 2)
{
// 如果出错删除原来添加的设备菜单
await _db.Deleteable<DbMenu>().Where(m=>m.Id==addDeviceMenuId).ExecuteCommandAsync();
await _db.Deleteable<DbMenu>().Where(m => m.Id == addDeviceMenuId).ExecuteCommandAsync();
throw new InvalidOperationException("添加默认变量表时发生了错误！！");
}
return true;
}
}
}