Skip to content

Mars
Mars

cdy816 / Mars

通知 3
Star 1
Fork 0
Mars
Mars

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 0a1b7b8f 编写于 作者: cdy816's avatar cdy816
浏览文件
操作

完善DBDevelopService WebApi接口

上级 0736789e
展开全部 隐藏空白更改
内联 并排
Showing with 2555 addition and 48 deletion
Develop/DBDevelopClientWebApi/Database.cs
浏览文件 @ 0a1b7b8f
using System;
using Cdy.Tag;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace DBDevelopClientWebApi
{
/// <summary>
///
/// </summary>
public class Database
{
public string Name { get; set; }
......@@ -21,19 +25,139 @@ namespace DBDevelopClientWebApi
public string Parent { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiTag
{
/// <summary>
///
/// </summary>
public Cdy.Tag.Tagbase RealTag { get; set; }
public WebApiRealTag RealTag { get; set; }
/// <summary>
///
/// </summary>
public Cdy.Tag.HisTag HisTag { get; set; }
}
public class WebApiRealTag
{
public int Id { get; set; }
public string Name { get; set; }
public int Type { get; set; }
public string Group { get; set; }
public string Desc { get; set; }
public string LinkAddress { get; set; }
public int ReadWriteType { get; set; }
public string Convert { get; set; }
public double MaxValue { get; set; }
public double MinValue { get; set; }
public byte Precision { get; set; }
/// <summary>
///
/// </summary>
/// <param name="realtag"></param>
/// <returns></returns>
public static WebApiRealTag CreatFromTagbase(Tagbase realtag)
{
WebApiRealTag tag = new WebApiRealTag();
tag.CloneFromRealTag(realtag);
return tag;
}
/// <summary>
///
/// </summary>
/// <param name="realtag"></param>
public void CloneFromRealTag(Tagbase realtag)
{
this.Id = realtag.Id;
this.Name = realtag.Name;
this.Type = (byte)realtag.Type;
this.Group = realtag.Group;
this.Desc = realtag.Desc;
this.LinkAddress = realtag.LinkAddress;
this.ReadWriteType = (int)realtag.ReadWriteType;
this.Convert = realtag.Conveter != null ? realtag.Conveter.SeriseToString() : "";
if (realtag is NumberTagBase)
{
this.MaxValue = (realtag as NumberTagBase).MaxValue;
this.MinValue = (realtag as NumberTagBase).MinValue;
}
if (realtag is FloatingTagBase)
{
this.Precision = (realtag as FloatingTagBase).Precision;
}
}
public Tagbase ConvertToTagbase()
{
Cdy.Tag.Tagbase re = null;
switch (this.Type)
{
case (int)(Cdy.Tag.TagType.Bool):
re = new Cdy.Tag.BoolTag();
break;
case (int)(Cdy.Tag.TagType.Byte):
re = new Cdy.Tag.ByteTag();
break;
case (int)(Cdy.Tag.TagType.DateTime):
re = new Cdy.Tag.DateTimeTag();
break;
case (int)(Cdy.Tag.TagType.Double):
re = new Cdy.Tag.DoubleTag();
break;
case (int)(Cdy.Tag.TagType.Float):
re = new Cdy.Tag.FloatTag();
break;
case (int)(Cdy.Tag.TagType.Int):
re = new Cdy.Tag.IntTag();
break;
case (int)(Cdy.Tag.TagType.UInt):
re = new Cdy.Tag.UIntTag();
break;
case (int)(Cdy.Tag.TagType.ULong):
re = new Cdy.Tag.ULongTag();
break;
case (int)(Cdy.Tag.TagType.UShort):
re = new Cdy.Tag.UShortTag();
break;
case (int)(Cdy.Tag.TagType.Long):
re = new Cdy.Tag.LongTag();
break;
case (int)(Cdy.Tag.TagType.Short):
re = new Cdy.Tag.ShortTag();
break;
case (int)(Cdy.Tag.TagType.String):
re = new Cdy.Tag.StringTag();
break;
}
if (re != null)
{
re.Name = this.Name;
re.LinkAddress = this.LinkAddress;
re.Group = this.Group;
re.Desc = this.Desc;
re.Id = (int)this.Id;
re.ReadWriteType = (Cdy.Tag.ReadWriteMode)this.ReadWriteType;
if (!string.IsNullOrEmpty(this.Convert))
{
re.Conveter = this.Convert.DeSeriseToValueConvert();
}
if (re is Cdy.Tag.NumberTagBase)
{
(re as Cdy.Tag.NumberTagBase).MaxValue = this.MaxValue;
(re as Cdy.Tag.NumberTagBase).MinValue = this.MinValue;
}
if (re is Cdy.Tag.FloatingTagBase)
{
(re as Cdy.Tag.FloatingTagBase).Precision = (byte)this.Precision;
}
}
return re;
}
}
}
Develop/DBDevelopClientWebApi/DatabaseUser.cs 0 → 100644
浏览文件 @ 0a1b7b8f
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace DBDevelopClientWebApi
{
/// <summary>
///
/// </summary>
public class WebApiUserGroup
{
public string Name { get; set; }
/// <summary>
///
/// </summary>
public string Parent { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiUserGroupRequest : WebApiDatabaseRequest
{
public string Name { get; set; }
/// <summary>
///
/// </summary>
public string Parent { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiMoveUserGroupRequest : WebApiDatabaseRequest
{
public string Name { get; set; }
/// <summary>
///
/// </summary>
public string OldParentName { get; set; }
/// <summary>
///
/// </summary>
public string NewParentName { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiRenameUserGroupRequest : WebApiDatabaseRequest
{
public string NewName { get; set; }
/// <summary>
///
/// </summary>
public string OldFullName { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiRequestByUserGroup:WebApiDatabaseRequest
{
public string GroupFullName { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiNewDatabasePermissionRequest : WebApiDatabaseRequest
{
/// <summary>
///
/// </summary>
public string Name { get; set; }
/// <summary>
///
/// </summary>
public string Desc { get; set; }
/// <summary>
///
/// </summary>
public bool EnableWrite { get; set; }
/// <summary>
///
/// </summary>
public bool SuperPermission { get; set; }
/// <summary>
/// 访问的变量
/// </summary>
public List<string> Group { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiRemoveDatabasePermissionRequest : WebApiDatabaseRequest
{
public string Permission { get; set; }
}
public class WebApiUserRequest : WebApiDatabaseRequest
{
public string UserName { get; set; }
}
public class WebApiUserAndPassword: WebApiUserRequest
{
public string Password { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiUserInfo : WebApiUserAndPassword
{
/// <summary>
///
/// </summary>
public string Group { get; set; }
/// <summary>
///
/// </summary>
public List<string> Permissions { get; set; }
}
public class WebApiUserInfoWithoutPassword : WebApiUserRequest
{
/// <summary>
///
/// </summary>
public string Group { get; set; }
/// <summary>
///
/// </summary>
public List<string> Permissions { get; set; }
}
}
Develop/DBDevelopClientWebApi/RequestBase.cs
浏览文件 @ 0a1b7b8f
......@@ -6,11 +6,6 @@ using System.Threading.Tasks;
namespace DBDevelopClientWebApi
{
public class RequestBase
{
public string Id { get; set; }
}
/// <summary>
///
/// </summary>
......@@ -51,6 +46,14 @@ namespace DBDevelopClientWebApi
#endregion ...Interfaces...
}
/// <summary>
///
/// </summary>
public class RequestBase
{
public string Id { get; set; }
}
/// <summary>
///
/// </summary>
......@@ -106,7 +109,7 @@ namespace DBDevelopClientWebApi
/// <summary>
///
/// </summary>
public class NewDatabaseRequest : WebApiDatabaseRequest
public class WebApiNewDatabaseRequest : WebApiDatabaseRequest
{
/// <summary>
///
......@@ -118,7 +121,7 @@ namespace DBDevelopClientWebApi
/// <summary>
///
/// </summary>
public class GetTagByGroupRequest : WebApiDatabaseRequest
public class WebApiGetTagByGroupRequest : WebApiDatabaseRequest
{
/// <summary>
///
......@@ -128,7 +131,7 @@ namespace DBDevelopClientWebApi
/// <summary>
///
/// </summary>
public Dictionary<string,string> Filters { get; set; }
public Dictionary<string, string> Filters { get; set; }
/// <summary>
///
......@@ -136,6 +139,60 @@ namespace DBDevelopClientWebApi
public int Index { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiAddGroupRequest : WebApiDatabaseRequest
{
public string Name { get; set; }
/// <summary>
///
/// </summary>
public string ParentName { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiRemoveGroupRequest : WebApiDatabaseRequest
{
public string FullName { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiRenameGroupRequest : WebApiDatabaseRequest
{
public string Name { get; set; }
/// <summary>
///
/// </summary>
public string OldFullName { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiMoveTagGroupRequest : WebApiDatabaseRequest
{
/// <summary>
///
/// </summary>
public string Name { get; set; }
/// <summary>
///
/// </summary>
public string NewParentName { get; set; }
/// <summary>
///
/// </summary>
public string OldParentName { get; set; }
}
/// <summary>
///
/// </summary>
......@@ -158,5 +215,27 @@ namespace DBDevelopClientWebApi
}
/// <summary>
///
/// </summary>
public class ResultResponse<T>
{
/// <summary>
///
/// </summary>
public bool HasErro { get; set; }
/// <summary>
///
/// </summary>
public T Result { get; set; }
/// <summary>
///
/// </summary>
public string ErroMsg { get; set; }
}
}
Develop/DBDevelopClientWebApi/SystemUser.cs 0 → 100644
浏览文件 @ 0a1b7b8f
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace DBDevelopClientWebApi
{
public class WebApiNewSystemUserRequest: RequestBase
{
#region ... Variables ...
#endregion ...Variables...
#region ... Events ...
#endregion ...Events...
#region ... Constructor...
#endregion ...Constructor...
#region ... Properties ...
public string UserName { get; set; }
/// <summary>
///
/// </summary>
public string Password { get; set; }
#endregion ...Properties...
#region ... Methods ...
#endregion ...Methods...
#region ... Interfaces ...
#endregion ...Interfaces...
}
public class WebApiReNameSystemUserRequest : RequestBase
{
public string OldName { get; set; }
public string NewName { get; set; }
}
public class WebApiModifySystemUserPasswordRequest : RequestBase
{
public string UserName { get; set; }
public string Password { get; set; }
public string NewPassword { get; set; }
}
public class WebApiUpdateSystemUserRequest : RequestBase
{
public string UserName { get; set; }
public bool IsAdmin { get; set; }
public bool NewDatabasePermission { get; set; }
public List<string> Databases { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiSystemUserItem
{
public string UserName { get; set; }
public bool IsAdmin { get; set; }
public bool NewDatabase { get; set; }
public List<string> Databases { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiRemoveSystemUserRequest : RequestBase
{
public string UserName { get; set; }
}
}
Develop/DBDevelopService/Controllers/Database.cs
浏览文件 @ 0a1b7b8f
using System;
using Cdy.Tag;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
......@@ -29,7 +30,7 @@ namespace DBDevelopService.Controllers
/// <summary>
///
/// </summary>
public Cdy.Tag.Tagbase RealTag { get; set; }
public WebApiRealTag RealTag { get; set; }
/// <summary>
///
......@@ -37,5 +38,129 @@ namespace DBDevelopService.Controllers
public Cdy.Tag.HisTag HisTag { get; set; }
}
public class WebApiRealTag
{
public int Id { get; set; }
public string Name { get; set; }
public int Type { get; set; }
public string Group { get; set; }
public string Desc { get; set; }
public string LinkAddress { get; set; }
public int ReadWriteType { get; set; }
public string Convert { get; set; }
public double MaxValue { get; set; }
public double MinValue { get; set; }
public byte Precision { get; set; }
/// <summary>
///
/// </summary>
/// <param name="realtag"></param>
/// <returns></returns>
public static WebApiRealTag CreatFromTagbase(Tagbase realtag)
{
WebApiRealTag tag = new WebApiRealTag();
tag.CloneFromRealTag(realtag);
return tag;
}
/// <summary>
///
/// </summary>
/// <param name="realtag"></param>
public void CloneFromRealTag(Tagbase realtag)
{
this.Id = realtag.Id;
this.Name = realtag.Name;
this.Type = (byte)realtag.Type;
this.Group = realtag.Group;
this.Desc = realtag.Desc;
this.LinkAddress = realtag.LinkAddress;
this.ReadWriteType = (int)realtag.ReadWriteType;
this.Convert = realtag.Conveter != null ? realtag.Conveter.SeriseToString() : "";
if(realtag is NumberTagBase)
{
this.MaxValue = (realtag as NumberTagBase).MaxValue;
this.MinValue = (realtag as NumberTagBase).MinValue;
}
if(realtag is FloatingTagBase)
{
this.Precision = (realtag as FloatingTagBase).Precision;
}
}
public Tagbase ConvertToTagbase()
{
Cdy.Tag.Tagbase re = null;
switch (this.Type)
{
case (int)(Cdy.Tag.TagType.Bool):
re = new Cdy.Tag.BoolTag();
break;
case (int)(Cdy.Tag.TagType.Byte):
re = new Cdy.Tag.ByteTag();
break;
case (int)(Cdy.Tag.TagType.DateTime):
re = new Cdy.Tag.DateTimeTag();
break;
case (int)(Cdy.Tag.TagType.Double):
re = new Cdy.Tag.DoubleTag();
break;
case (int)(Cdy.Tag.TagType.Float):
re = new Cdy.Tag.FloatTag();
break;
case (int)(Cdy.Tag.TagType.Int):
re = new Cdy.Tag.IntTag();
break;
case (int)(Cdy.Tag.TagType.UInt):
re = new Cdy.Tag.UIntTag();
break;
case (int)(Cdy.Tag.TagType.ULong):
re = new Cdy.Tag.ULongTag();
break;
case (int)(Cdy.Tag.TagType.UShort):
re = new Cdy.Tag.UShortTag();
break;
case (int)(Cdy.Tag.TagType.Long):
re = new Cdy.Tag.LongTag();
break;
case (int)(Cdy.Tag.TagType.Short):
re = new Cdy.Tag.ShortTag();
break;
case (int)(Cdy.Tag.TagType.String):
re = new Cdy.Tag.StringTag();
break;
}
if (re != null)
{
re.Name = this.Name;
re.LinkAddress = this.LinkAddress;
re.Group = this.Group;
re.Desc = this.Desc;
re.Id = (int)this.Id;
re.ReadWriteType = (Cdy.Tag.ReadWriteMode)this.ReadWriteType;
if (!string.IsNullOrEmpty(this.Convert))
{
re.Conveter = this.Convert.DeSeriseToValueConvert();
}
if (re is Cdy.Tag.NumberTagBase)
{
(re as Cdy.Tag.NumberTagBase).MaxValue = this.MaxValue;
(re as Cdy.Tag.NumberTagBase).MinValue = this.MinValue;
}
if (re is Cdy.Tag.FloatingTagBase)
{
(re as Cdy.Tag.FloatingTagBase).Precision = (byte)this.Precision;
}
}
return re;
}
}
}
Develop/DBDevelopService/Controllers/DatabaseUser.cs 0 → 100644
浏览文件 @ 0a1b7b8f
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace DBDevelopService.Controllers
{
/// <summary>
///
/// </summary>
public class WebApiUserGroup
{
public string Name { get; set; }
/// <summary>
///
/// </summary>
public string Parent { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiUserGroupRequest : WebApiDatabaseRequest
{
public string Name { get; set; }
/// <summary>
///
/// </summary>
public string Parent { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiMoveUserGroupRequest : WebApiDatabaseRequest
{
public string Name { get; set; }
/// <summary>
///
/// </summary>
public string OldParentName { get; set; }
/// <summary>
///
/// </summary>
public string NewParentName { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiRenameUserGroupRequest : WebApiDatabaseRequest
{
public string NewName { get; set; }
/// <summary>
///
/// </summary>
public string OldFullName { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiRequestByUserGroup:WebApiDatabaseRequest
{
public string GroupFullName { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiNewDatabasePermissionRequest : WebApiDatabaseRequest
{
/// <summary>
///
/// </summary>
public string Name { get; set; }
/// <summary>
///
/// </summary>
public string Desc { get; set; }
/// <summary>
///
/// </summary>
public bool EnableWrite { get; set; }
/// <summary>
///
/// </summary>
public bool SuperPermission { get; set; }
/// <summary>
/// 访问的变量
/// </summary>
public List<string> Group { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiRemoveDatabasePermissionRequest : WebApiDatabaseRequest
{
public string Permission { get; set; }
}
public class WebApiUserRequest : WebApiDatabaseRequest
{
public string UserName { get; set; }
}
public class WebApiUserAndPassword: WebApiUserRequest
{
public string Password { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiUserInfo : WebApiUserAndPassword
{
/// <summary>
///
/// </summary>
public string Group { get; set; }
/// <summary>
///
/// </summary>
public List<string> Permissions { get; set; }
}
public class WebApiUserInfoWithoutPassword : WebApiUserRequest
{
/// <summary>
///
/// </summary>
public string Group { get; set; }
/// <summary>
///
/// </summary>
public List<string> Permissions { get; set; }
}
}
Develop/DBDevelopService/Controllers/RequestBase.cs
浏览文件 @ 0a1b7b8f
......@@ -6,6 +6,7 @@ using System.Threading.Tasks;
namespace DBDevelopService.Controllers
{
public class RequestBase
{
public string Id { get; set; }
......@@ -66,7 +67,7 @@ namespace DBDevelopService.Controllers
/// <summary>
///
/// </summary>
public class NewDatabaseRequest : WebApiDatabaseRequest
public class WebApiNewDatabaseRequest : WebApiDatabaseRequest
{
/// <summary>
///
......@@ -78,7 +79,7 @@ namespace DBDevelopService.Controllers
/// <summary>
///
/// </summary>
public class GetTagByGroupRequest : WebApiDatabaseRequest
public class WebApiGetTagByGroupRequest : WebApiDatabaseRequest
{
/// <summary>
///
......@@ -96,6 +97,60 @@ namespace DBDevelopService.Controllers
public int Index { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiAddGroupRequest : WebApiDatabaseRequest
{
public string Name { get; set; }
/// <summary>
///
/// </summary>
public string ParentName { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiRemoveGroupRequest : WebApiDatabaseRequest
{
public string FullName { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiRenameGroupRequest : WebApiDatabaseRequest
{
public string Name { get; set; }
/// <summary>
///
/// </summary>
public string OldFullName { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiMoveTagGroupRequest : WebApiDatabaseRequest
{
/// <summary>
///
/// </summary>
public string Name { get; set; }
/// <summary>
///
/// </summary>
public string NewParentName { get; set; }
/// <summary>
///
/// </summary>
public string OldParentName { get; set; }
}
/// <summary>
///
/// </summary>
......
Develop/DBDevelopService/Controllers/SystemUser.cs 0 → 100644
浏览文件 @ 0a1b7b8f
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace DBDevelopService.Controllers
{
public class WebApiNewSystemUserRequest: RequestBase
{
#region ... Variables ...
#endregion ...Variables...
#region ... Events ...
#endregion ...Events...
#region ... Constructor...
#endregion ...Constructor...
#region ... Properties ...
public string UserName { get; set; }
/// <summary>
///
/// </summary>
public string Password { get; set; }
#endregion ...Properties...
#region ... Methods ...
#endregion ...Methods...
#region ... Interfaces ...
#endregion ...Interfaces...
}
public class WebApiReNameSystemUserRequest : RequestBase
{
public string OldName { get; set; }
public string NewName { get; set; }
}
public class WebApiModifySystemUserPasswordRequest : RequestBase
{
public string UserName { get; set; }
public string Password { get; set; }
public string NewPassword { get; set; }
}
public class WebApiUpdateSystemUserRequest : RequestBase
{
public string UserName { get; set; }
public bool IsAdmin { get; set; }
public bool NewDatabasePermission { get; set; }
public List<string> Databases { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiSystemUserItem
{
public string UserName { get; set; }
public bool IsAdmin { get; set; }
public bool NewDatabase { get; set; }
public List<string> Databases { get; set; }
}
/// <summary>
///
/// </summary>
public class WebApiRemoveSystemUserRequest : WebApiDatabaseRequest
{
public string UserName { get; set; }
}
}
Develop/DBDevelopService/Security/UserDocument.cs
浏览文件 @ 0a1b7b8f
......@@ -91,13 +91,14 @@ namespace DBDevelopService
///
/// </summary>
/// <param name="user"></param>
public void AddUser(User user)
public bool AddUser(User user)
{
if(!mUsers.ContainsKey(user.Name))
{
mUsers.Add(user.Name, user);
return true;
}
return false;
}
/// <summary>
......
Develop/DBDevelopService/Services/DevelopServerService.cs
浏览文件 @ 0a1b7b8f
......@@ -448,7 +448,7 @@ namespace DBDevelopService
var usergroup = db.Security.User.GetUserGroup(request.Name);
if(usergroup!=null)
{
db.Security.User.RemoveUserGroup(usergroup.Name);
db.Security.User.RemoveUserGroup(usergroup.FullName);
}
}
return Task.FromResult(new BoolResultReplay() { Result = true });
......@@ -1413,7 +1413,7 @@ namespace DBDevelopService
}
/// <summary>
///
/// 清除某个变量组内所有变量
/// </summary>
/// <param name="request"></param>
/// <param name="context"></param>
......
Develop/DBStudio/Properties/launchSettings.json
浏览文件 @ 0a1b7b8f
......@@ -2,7 +2,7 @@
"profiles": {
"DBInStudioServer": {
"commandName": "Executable",
"executablePath": "C:\\Users\\cdy81\\source\\repos\\mars\\Output\\DBInStudioServer.exe"
"executablePath": "C:\\Users\\chongdaoyang\\source\\repos\\mars\\Output\\DBInStudioServer.exe"
}
}
}
\ No newline at end of file
Example/Develop/DevelopWebApiDemo/MainWindow.xaml
浏览文件 @ 0a1b7b8f
......@@ -14,6 +14,12 @@
<Label Content="服务器:" HorizontalAlignment="Left" Margin="12,0,0,0" VerticalAlignment="Center"/>
<TextBox x:Name="serverIp" HorizontalAlignment="Left" Margin="69,0,0,0" Text="http://localhost:9000" TextWrapping="Wrap" VerticalAlignment="Center" Width="558"/>
<Button x:Name="loginb" Content="登录" HorizontalAlignment="Left" Margin="647,0,0,0" VerticalAlignment="Center" Width="72" Click="loginb_Click"/>
<Button x:Name="getTagGroup" Content="获取变量组" HorizontalAlignment="Left" Margin="23,47,0,0" VerticalAlignment="Top" Width="72" Click="getTagGroup_Click" Grid.Row="1"/>
<Button x:Name="getTag" Content="获取变量" HorizontalAlignment="Left" Margin="23,85,0,0" VerticalAlignment="Top" Width="72" Click="getTag_Click" Grid.Row="1"/>
<ComboBox x:Name="groupList" SelectionChanged="groupList_SelectionChanged" HorizontalAlignment="Left" Margin="109,45,0,0" Grid.Row="1" VerticalAlignment="Top" Width="518"/>
<Button x:Name="getDatabase" Content="获取数据库" HorizontalAlignment="Left" Margin="23,9,0,0" VerticalAlignment="Top" Width="72" Click="getDatabase_Click" Grid.Row="1"/>
<ComboBox SelectionChanged="databaseList_SelectionChanged" x:Name="databaseList" HorizontalAlignment="Left" Margin="109,8,0,0" Grid.Row="1" VerticalAlignment="Top" Width="518"/>
<ComboBox x:Name="taglist" HorizontalAlignment="Left" Margin="109,84,0,0" Grid.Row="1" VerticalAlignment="Top" Width="518"/>
</Grid>
</Window>
Example/Develop/DevelopWebApiDemo/MainWindow.xaml.cs
浏览文件 @ 0a1b7b8f
......@@ -21,6 +21,8 @@ namespace DevelopWebApiDemo
public partial class MainWindow : Window
{
DBDevelopClientWebApi.DevelopServiceHelper mHelper;
private string mCurrentDatabase="";
private string mTagGroup = "";
public MainWindow()
{
InitializeComponent();
......@@ -32,5 +34,56 @@ namespace DevelopWebApiDemo
mHelper.Server = serverIp.Text;
mHelper.Login("Admin", "Admin");
}
private void getTag_Click(object sender, RoutedEventArgs e)
{
var tags = mHelper.GetTagByGroup(mCurrentDatabase, mTagGroup, 0);
if(tags!=null)
{
taglist.ItemsSource = tags.Select(e => e.Item1.Name).ToList();
}
}
private void getTagGroup_Click(object sender, RoutedEventArgs e)
{
List<string> ltmp = new List<string>();
ltmp.Add("");
var grps = mHelper.GetTagGroup(mCurrentDatabase);
if(grps!=null)
{
foreach(var vv in grps)
{
if(!string.IsNullOrEmpty(vv.Parent))
{
ltmp.Add(vv.Parent + "." + vv.Name);
}
else
{
ltmp.Add(vv.Name);
}
}
}
groupList.ItemsSource = ltmp;
}
private void getDatabase_Click(object sender, RoutedEventArgs e)
{
var vdd = mHelper.QueryDatabase();
if (vdd != null)
{
databaseList.ItemsSource = vdd.Select(e => e.Name);
}
}
private void databaseList_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
mCurrentDatabase = databaseList.SelectedItem.ToString();
}
private void groupList_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
mTagGroup = groupList.SelectedItem.ToString();
}
}
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或