提交 c5a6e60e 编写于 作者: cdy816's avatar cdy816

DBDevelopClientWebApi 接口功能完善

上级 10d012a7
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<PackageProjectUrl>https://github.com/cdy816/mars</PackageProjectUrl> <PackageProjectUrl>https://github.com/cdy816/mars</PackageProjectUrl>
<Description>DBDevelop Server WebApi SDK</Description> <Description>DBDevelop Server WebApi SDK</Description>
<Copyright /> <Copyright />
<Version>1.0.1</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
...@@ -236,6 +236,18 @@ namespace DBDevelopClientWebApi ...@@ -236,6 +236,18 @@ namespace DBDevelopClientWebApi
public string ErroMsg { get; set; } public string ErroMsg { get; set; }
} }
/// <summary>
///
/// </summary>
/// <typeparam name="T"></typeparam>
public class GetTagsResponse<T> : ResultResponse<T>
{
/// <summary>
///
/// </summary>
public int TotalPages { get; set; }
}
} }
...@@ -432,7 +432,7 @@ namespace DBDevelopService.Controllers ...@@ -432,7 +432,7 @@ namespace DBDevelopService.Controllers
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public object GetTagByGroup([FromBody] WebApiGetTagByGroupRequest request) public object GetTagByGroup([FromBody] WebApiGetTagByGroupRequest request)
{ {
if (!CheckLoginId(request.Id, request.Database)) if (!CheckLoginId(request.Id, request.Database))
{ {
...@@ -450,7 +450,7 @@ namespace DBDevelopService.Controllers ...@@ -450,7 +450,7 @@ namespace DBDevelopService.Controllers
int from = request.Index * PageCount; int from = request.Index * PageCount;
var res = db.RealDatabase.ListAllTags().Where(e => e.Group == request.GroupName); var res = db.RealDatabase.ListAllTags().Where(e => e.Group == request.GroupName);
if (request.Filters!=null && request.Filters.Count > 0) if (request.Filters != null && request.Filters.Count > 0)
{ {
res = FilterTags(db, res, request.Filters); res = FilterTags(db, res, request.Filters);
} }
...@@ -478,7 +478,7 @@ namespace DBDevelopService.Controllers ...@@ -478,7 +478,7 @@ namespace DBDevelopService.Controllers
} }
} }
} }
return new ResultResponse() { Result = re }; return new GetTagsByGroupResponse() { Result = re, TotalPages = totalpage };
} }
......
...@@ -172,6 +172,15 @@ namespace DBDevelopService.Controllers ...@@ -172,6 +172,15 @@ namespace DBDevelopService.Controllers
public string ErroMsg { get; set; } public string ErroMsg { get; set; }
} }
/// <summary>
///
/// </summary>
public class GetTagsByGroupResponse : ResultResponse
{
public int TotalPages { get; set; }
}
} }
...@@ -37,7 +37,8 @@ namespace DevelopWebApiDemo ...@@ -37,7 +37,8 @@ namespace DevelopWebApiDemo
private void getTag_Click(object sender, RoutedEventArgs e) private void getTag_Click(object sender, RoutedEventArgs e)
{ {
var tags = mHelper.GetTagByGroup(mCurrentDatabase, mTagGroup, 0); int count = 0;
var tags = mHelper.GetTagByGroup(mCurrentDatabase, mTagGroup, 0,out count);
if(tags!=null) if(tags!=null)
{ {
taglist.ItemsSource = tags.Select(e => e.Item1.Name).ToList(); taglist.ItemsSource = tags.Select(e => e.Item1.Name).ToList();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册