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

DBDevelopClientWebApi 接口功能完善

上级 10d012a7
......@@ -8,6 +8,7 @@
<PackageProjectUrl>https://github.com/cdy816/mars</PackageProjectUrl>
<Description>DBDevelop Server WebApi SDK</Description>
<Copyright />
<Version>1.0.1</Version>
</PropertyGroup>
<ItemGroup>
......
......@@ -20,7 +20,7 @@ namespace DBDevelopClientWebApi
WebClient mClient;
private string mLoginId;
public const int PageCount = 500;
#endregion ...Variables...
......@@ -75,20 +75,29 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool Login(string username, string password)
{
LoginMessage login = new LoginMessage() { UserName = username, Password = password };
string sval = Post("Login", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<string>>(sval);
if (result.HasErro)
try
{
LastErroMessage = result.ErroMsg;
return false;
LoginMessage login = new LoginMessage() { UserName = username, Password = password };
string sval = Post("Login", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<string>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
mLoginId = result.Result.ToString();
return true;
}
}
else
catch (Exception ex)
{
mLoginId = result.Result.ToString();
return true;
LastErroMessage = ex.Message;
return false;
}
}
/// <summary>
......@@ -97,9 +106,17 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool Logout()
{
RequestBase request = new RequestBase() { Id = mLoginId };
Post("Logout", JsonConvert.SerializeObject(request));
return true;
try
{
RequestBase request = new RequestBase() { Id = mLoginId };
Post("Logout", JsonConvert.SerializeObject(request));
return true;
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
/// <summary>
......@@ -110,17 +127,33 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool NewDatabase(string database, string desc)
{
WebApiNewDatabaseRequest nd = new WebApiNewDatabaseRequest() { Database = database, Desc = desc, Id = mLoginId };
string sval = Post("NewDatabase", JsonConvert.SerializeObject(nd));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (!string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
return false;
try
{
WebApiNewDatabaseRequest nd = new WebApiNewDatabaseRequest() { Database = database, Desc = desc, Id = mLoginId };
string sval = Post("NewDatabase", JsonConvert.SerializeObject(nd));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return (bool)result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
else
{
return (bool)result.Result;
LastErroMessage = "未登录";
return false;
}
}
......@@ -130,18 +163,35 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public List<Database> QueryDatabase()
{
RequestBase nd = new RequestBase() { Id = mLoginId };
var sval = Post("QueryDatabase", JsonConvert.SerializeObject(nd));
var result = JsonConvert.DeserializeObject<ResultResponse<List<Database>>>(sval);
if (result.HasErro)
if (!string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
return null;
try
{
RequestBase nd = new RequestBase() { Id = mLoginId };
var sval = Post("QueryDatabase", JsonConvert.SerializeObject(nd));
var result = JsonConvert.DeserializeObject<ResultResponse<List<Database>>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return null;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return null;
}
}
else
{
return result.Result;
LastErroMessage = "未登录";
return null;
}
}
/// <summary>
......@@ -150,17 +200,33 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool Start(string database)
{
WebApiDatabaseRequest wr = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
var sval = Post("Start", JsonConvert.SerializeObject(wr));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (!string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
return false;
try
{
WebApiDatabaseRequest wr = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
var sval = Post("Start", JsonConvert.SerializeObject(wr));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return (bool)result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
else
{
return (bool)result.Result;
LastErroMessage = "未登录";
return false;
}
}
......@@ -171,17 +237,33 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool Stop(string database)
{
WebApiDatabaseRequest wr = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
var sval = Post("Stop", JsonConvert.SerializeObject(wr));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (!string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
return false;
try
{
WebApiDatabaseRequest wr = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
var sval = Post("Stop", JsonConvert.SerializeObject(wr));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return (bool)result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
else
{
return (bool)result.Result;
LastErroMessage = "未登录";
return false;
}
}
......@@ -192,17 +274,33 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool ReRun(string database)
{
WebApiDatabaseRequest wr = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
var sval = Post("ReRun", JsonConvert.SerializeObject(wr));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (!string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
return false;
try
{
WebApiDatabaseRequest wr = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
var sval = Post("ReRun", JsonConvert.SerializeObject(wr));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return (bool)result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
else
{
return (bool)result.Result;
LastErroMessage = "未登录";
return false;
}
}
......@@ -213,17 +311,33 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool IsDatabaseRunning(string database)
{
WebApiDatabaseRequest wr = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
var sval = Post("IsDatabaseRunning", JsonConvert.SerializeObject(wr));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (!string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
return false;
try
{
WebApiDatabaseRequest wr = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
var sval = Post("IsDatabaseRunning", JsonConvert.SerializeObject(wr));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return (bool)result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
else
{
return (bool)result.Result;
LastErroMessage = "未登录";
return false;
}
}
......@@ -234,17 +348,33 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool IsDatabaseDirty(string database)
{
WebApiDatabaseRequest wr = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
var sval = Post("IsDatabaseDirty", JsonConvert.SerializeObject(wr));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (!string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
return false;
try
{
WebApiDatabaseRequest wr = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
var sval = Post("IsDatabaseDirty", JsonConvert.SerializeObject(wr));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return (bool)result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
else
{
return (bool)result.Result;
LastErroMessage = "未登录";
return false;
}
}
......@@ -255,17 +385,33 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public List<TagGroup> GetTagGroup(string database)
{
WebApiDatabaseRequest wr = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
var sval = Post("GetTagGroup", JsonConvert.SerializeObject(wr));
var result = JsonConvert.DeserializeObject<ResultResponse<List<TagGroup>>>(sval);
if (result.HasErro)
if (!string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
return null;
try
{
WebApiDatabaseRequest wr = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
var sval = Post("GetTagGroup", JsonConvert.SerializeObject(wr));
var result = JsonConvert.DeserializeObject<ResultResponse<List<TagGroup>>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return null;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return null;
}
}
else
{
return result.Result;
LastErroMessage = "未登录";
return null;
}
}
......@@ -277,24 +423,44 @@ namespace DBDevelopClientWebApi
/// <param name="pageIndex"></param>
/// <param name="mFilter"></param>
/// <returns></returns>
public List<Tuple<Tagbase, HisTag>> GetTagByGroup(string database, string group, int pageIndex, Dictionary<string, string> mFilter = null)
public List<Tuple<Tagbase, HisTag>> GetTagByGroup(string database, string group, int pageIndex,out int pageCount, Dictionary<string, string> mFilter = null)
{
WebApiGetTagByGroupRequest wr = new WebApiGetTagByGroupRequest() { Database = database, Id = mLoginId, GroupName = group, Index = pageIndex, Filters = mFilter };
var sval = Post("GetTagByGroup", JsonConvert.SerializeObject(wr));
var result = JsonConvert.DeserializeObject<ResultResponse<List<WebApiTag>>>(sval);
if (result.HasErro)
if (!string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
return null;
try
{
WebApiGetTagByGroupRequest wr = new WebApiGetTagByGroupRequest() { Database = database, Id = mLoginId, GroupName = group, Index = pageIndex, Filters = mFilter };
var sval = Post("GetTagByGroup", JsonConvert.SerializeObject(wr));
var result = JsonConvert.DeserializeObject<GetTagsResponse<List<WebApiTag>>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
pageCount = 0;
return null;
}
else
{
List<Tuple<Tagbase, HisTag>> re = new List<Tuple<Tagbase, HisTag>>();
foreach (var vv in result.Result)
{
re.Add(new Tuple<Tagbase, HisTag>(vv.RealTag.ConvertToTagbase(), vv.HisTag));
}
pageCount = result.TotalPages;
return re;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
pageCount = 0;
return null;
}
}
else
{
List<Tuple<Tagbase, HisTag>> re = new List<Tuple<Tagbase, HisTag>>();
foreach (var vv in result.Result)
{
re.Add(new Tuple<Tagbase, HisTag>(vv.RealTag.ConvertToTagbase(), vv.HisTag));
}
return re;
LastErroMessage = "未登录";
pageCount = 0;
return null;
}
}
......@@ -305,17 +471,30 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool AddTagGroup(string name, string parentName, string database)
{
WebApiAddGroupRequest request = new WebApiAddGroupRequest() { Database = database, Id = mLoginId, Name = name, ParentName = parentName };
var sval = Post("AddTagGroup", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
WebApiAddGroupRequest request = new WebApiAddGroupRequest() { Database = database, Id = mLoginId, Name = name, ParentName = parentName };
var sval = Post("AddTagGroup", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
return result.Result;
LastErroMessage = ex.Message;
return false;
}
}
......@@ -327,17 +506,30 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool RemoveTagGroup(string fullName, string database)
{
WebApiRemoveGroupRequest request = new WebApiRemoveGroupRequest() { Database = database, Id = mLoginId, FullName = fullName };
var sval = Post("RemoveTagGroup", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
return result.Result;
WebApiRemoveGroupRequest request = new WebApiRemoveGroupRequest() { Database = database, Id = mLoginId, FullName = fullName };
var sval = Post("RemoveTagGroup", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
......@@ -350,17 +542,30 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool RenameTagGroup(string oldFullName, string newName, string database)
{
WebApiRenameGroupRequest request = new WebApiRenameGroupRequest() { Database = database, Id = mLoginId, Name = newName, OldFullName = oldFullName };
var sval = Post("RenameTagGroup", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
return result.Result;
WebApiRenameGroupRequest request = new WebApiRenameGroupRequest() { Database = database, Id = mLoginId, Name = newName, OldFullName = oldFullName };
var sval = Post("RenameTagGroup", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
......@@ -374,17 +579,30 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool MoveTagGroup(string name, string oldParentName, string newParentName, string database)
{
WebApiMoveTagGroupRequest request = new WebApiMoveTagGroupRequest() { Database = database, Id = mLoginId, Name = name, OldParentName = oldParentName, NewParentName = newParentName };
var sval = Post("MoveTagGroup", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
WebApiMoveTagGroupRequest request = new WebApiMoveTagGroupRequest() { Database = database, Id = mLoginId, Name = name, OldParentName = oldParentName, NewParentName = newParentName };
var sval = Post("MoveTagGroup", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
return result.Result;
LastErroMessage = ex.Message;
return false;
}
}
......@@ -396,17 +614,30 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool RemoveTags(List<int> tagIds, string database)
{
WebApiRemoveTagRequest request = new WebApiRemoveTagRequest() { Database = database, Id = mLoginId, TagIds = tagIds };
var sval = Post("RemoveTag", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
WebApiRemoveTagRequest request = new WebApiRemoveTagRequest() { Database = database, Id = mLoginId, TagIds = tagIds };
var sval = Post("RemoveTag", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
return result.Result;
LastErroMessage = ex.Message;
return false;
}
}
......@@ -430,17 +661,30 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public int? AddTag(Tagbase realTag, HisTag histag, string database)
{
WebApiAddTagRequest request = new WebApiAddTagRequest() { Database = database, Id = mLoginId, Tags = new List<WebApiTag>() { new WebApiTag() { RealTag = WebApiRealTag.CreatFromTagbase(realTag), HisTag = histag } } };
var sval = Post("AddTag", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<List<int>>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return null;
}
else
try
{
return result.Result[0];
WebApiAddTagRequest request = new WebApiAddTagRequest() { Database = database, Id = mLoginId, Tags = new List<WebApiTag>() { new WebApiTag() { RealTag = WebApiRealTag.CreatFromTagbase(realTag), HisTag = histag } } };
var sval = Post("AddTag", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<List<int>>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return null;
}
else
{
return result.Result[0];
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return null;
}
}
......@@ -452,22 +696,35 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public List<int> AddTags(List<Tuple<Tagbase, HisTag>> mtags, string database)
{
List<WebApiTag> ltmp = new List<WebApiTag>();
foreach (var vv in mtags)
if (string.IsNullOrEmpty(mLoginId))
{
ltmp.Add(new WebApiTag() { RealTag = WebApiRealTag.CreatFromTagbase(vv.Item1), HisTag = vv.Item2 });
LastErroMessage = "未登录";
return null;
}
WebApiAddTagRequest request = new WebApiAddTagRequest() { Database = database, Id = mLoginId, Tags = ltmp };
var sval = Post("AddTag", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<List<int>>>(sval);
if (result.HasErro)
try
{
LastErroMessage = result.ErroMsg;
return null;
List<WebApiTag> ltmp = new List<WebApiTag>();
foreach (var vv in mtags)
{
ltmp.Add(new WebApiTag() { RealTag = WebApiRealTag.CreatFromTagbase(vv.Item1), HisTag = vv.Item2 });
}
WebApiAddTagRequest request = new WebApiAddTagRequest() { Database = database, Id = mLoginId, Tags = ltmp };
var sval = Post("AddTag", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<List<int>>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return null;
}
else
{
return result.Result;
}
}
else
catch (Exception ex)
{
return result.Result;
LastErroMessage = ex.Message;
return null;
}
}
......@@ -479,17 +736,30 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool UpdateHisTag(HisTag histag, string database)
{
WebApiTagRequest request = new WebApiTagRequest() { Id = mLoginId, Database = database, Tag = new WebApiTag() { HisTag = histag } };
var sval = Post("UpdateHisTag", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
return result.Result;
WebApiTagRequest request = new WebApiTagRequest() { Id = mLoginId, Database = database, Tag = new WebApiTag() { HisTag = histag } };
var sval = Post("UpdateHisTag", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
......@@ -501,17 +771,30 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool UpdateRealTag(Tagbase realtag, string database)
{
WebApiTagRequest request = new WebApiTagRequest() { Id = mLoginId, Database = database, Tag = new WebApiTag() { RealTag = WebApiRealTag.CreatFromTagbase(realtag) } };
var sval = Post("UpdateRealTag", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
WebApiTagRequest request = new WebApiTagRequest() { Id = mLoginId, Database = database, Tag = new WebApiTag() { RealTag = WebApiRealTag.CreatFromTagbase(realtag) } };
var sval = Post("UpdateRealTag", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
return result.Result;
LastErroMessage = ex.Message;
return false;
}
}
......@@ -525,17 +808,30 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public int? Import(Tagbase realTag, HisTag histag, int mode, string database)
{
WebApiImportTagRequest request = new WebApiImportTagRequest() { Database = database, Id = mLoginId, Mode = mode, Tag = new WebApiTag() { RealTag = WebApiRealTag.CreatFromTagbase(realTag), HisTag = histag } };
var sval = Post("Import", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<int>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return null;
}
else
try
{
return result.Result;
WebApiImportTagRequest request = new WebApiImportTagRequest() { Database = database, Id = mLoginId, Mode = mode, Tag = new WebApiTag() { RealTag = WebApiRealTag.CreatFromTagbase(realTag), HisTag = histag } };
var sval = Post("Import", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<int>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return null;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return null;
}
}
......@@ -546,17 +842,30 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool Save(string database)
{
WebApiDatabaseRequest request = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
var sval = Post("Save", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
WebApiDatabaseRequest request = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
var sval = Post("Save", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
return result.Result;
LastErroMessage = ex.Message;
return false;
}
}
......@@ -567,17 +876,30 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool Cancel(string database)
{
WebApiDatabaseRequest request = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
var sval = Post("Cancel", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
WebApiDatabaseRequest request = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
var sval = Post("Cancel", JsonConvert.SerializeObject(request));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
return result.Result;
LastErroMessage = ex.Message;
return false;
}
}
#endregion
......@@ -590,20 +912,33 @@ namespace DBDevelopClientWebApi
/// <param name="Name"></param>
/// <param name="Parent"></param>
/// <returns></returns>
public bool AddDatabaseUserGroup(string Name,string Parent,string database)
public bool AddDatabaseUserGroup(string Name, string Parent, string database)
{
WebApiUserGroupRequest login = new WebApiUserGroupRequest() { Name = Name, Parent = Parent,Database=database,Id=mLoginId };
string sval = Post("AddDatabaseUserGroup", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
return result.Result;
WebApiUserGroupRequest login = new WebApiUserGroupRequest() { Name = Name, Parent = Parent, Database = database, Id = mLoginId };
string sval = Post("AddDatabaseUserGroup", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
......@@ -614,18 +949,31 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public List<WebApiUserGroup> GetDatabaseUserGroup(string database)
{
WebApiDatabaseRequest login = new WebApiDatabaseRequest() { Database=database,Id=mLoginId };
string sval = Post("GetDatabaseUserGroup", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<List<WebApiUserGroup>>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return null;
}
else
try
{
return result.Result;
WebApiDatabaseRequest login = new WebApiDatabaseRequest() { Database = database, Id = mLoginId };
string sval = Post("GetDatabaseUserGroup", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<List<WebApiUserGroup>>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return null;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return null;
}
}
......@@ -639,18 +987,31 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool MoveDatabaseUserGroup(string name, string oldParentName, string newParentName, string database)
{
WebApiMoveUserGroupRequest login = new WebApiMoveUserGroupRequest() { Name = name, NewParentName = newParentName, OldParentName = oldParentName, Database = database, Id = mLoginId };
string sval = Post("MoveDatabaseUserGroup", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
WebApiMoveUserGroupRequest login = new WebApiMoveUserGroupRequest() { Name = name, NewParentName = newParentName, OldParentName = oldParentName, Database = database, Id = mLoginId };
string sval = Post("MoveDatabaseUserGroup", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
return result.Result;
LastErroMessage = ex.Message;
return false;
}
}
......@@ -660,20 +1021,33 @@ namespace DBDevelopClientWebApi
/// <param name="group"></param>
/// <param name="database"></param>
/// <returns></returns>
public bool RemoveDatabaseUserGroup(string group,string database)
public bool RemoveDatabaseUserGroup(string group, string database)
{
WebApiRequestByUserGroup login = new WebApiRequestByUserGroup() { GroupFullName=group, Database = database, Id = mLoginId };
string sval = Post("RemoveDatabaseUserGroup", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
return result.Result;
WebApiRequestByUserGroup login = new WebApiRequestByUserGroup() { GroupFullName = group, Database = database, Id = mLoginId };
string sval = Post("RemoveDatabaseUserGroup", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
......@@ -684,20 +1058,33 @@ namespace DBDevelopClientWebApi
/// <param name="oldFullName"></param>
/// <param name="database"></param>
/// <returns></returns>
public bool RenameDatabaseUserGroup(string newName,string oldFullName,string database)
public bool RenameDatabaseUserGroup(string newName, string oldFullName, string database)
{
WebApiRenameUserGroupRequest login = new WebApiRenameUserGroupRequest() { NewName = newName,OldFullName= oldFullName, Database = database, Id = mLoginId };
string sval = Post("RenameDatabaseUserGroup", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
WebApiRenameUserGroupRequest login = new WebApiRenameUserGroupRequest() { NewName = newName, OldFullName = oldFullName, Database = database, Id = mLoginId };
string sval = Post("RenameDatabaseUserGroup", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
return result.Result;
LastErroMessage = ex.Message;
return false;
}
}
......@@ -707,20 +1094,33 @@ namespace DBDevelopClientWebApi
/// <param name="groupFullName"></param>
/// <param name="database"></param>
/// <returns></returns>
public List<WebApiUserInfoWithoutPassword> GetDatabaseUserByGroup(string groupFullName,string database)
public List<WebApiUserInfoWithoutPassword> GetDatabaseUserByGroup(string groupFullName, string database)
{
WebApiRequestByUserGroup login = new WebApiRequestByUserGroup() { GroupFullName = groupFullName, Database = database, Id = mLoginId };
string sval = Post("GetDatabaseUserByGroup", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<List<WebApiUserInfoWithoutPassword>>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return null;
}
else
try
{
return result.Result;
WebApiRequestByUserGroup login = new WebApiRequestByUserGroup() { GroupFullName = groupFullName, Database = database, Id = mLoginId };
string sval = Post("GetDatabaseUserByGroup", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<List<WebApiUserInfoWithoutPassword>>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return null;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return null;
}
}
......@@ -733,20 +1133,33 @@ namespace DBDevelopClientWebApi
/// <param name="permissions"></param>
/// <param name="database"></param>
/// <returns></returns>
public bool NewDatabaseUser(string userName,string password,string group,List<string> permissions,string database)
public bool NewDatabaseUser(string userName, string password, string group, List<string> permissions, string database)
{
WebApiUserInfo login = new WebApiUserInfo() { UserName = userName, Password = password,Group=group,Permissions=permissions, Database = database, Id = mLoginId };
string sval = Post("NewDatabaseUser", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
WebApiUserInfo login = new WebApiUserInfo() { UserName = userName, Password = password, Group = group, Permissions = permissions, Database = database, Id = mLoginId };
string sval = Post("NewDatabaseUser", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
return result.Result;
LastErroMessage = ex.Message;
return false;
}
}
......@@ -761,18 +1174,31 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool UpdateDatabaseUser(string userName, string password, string group, List<string> permissions, string database)
{
WebApiUserInfo login = new WebApiUserInfo() { UserName = userName, Password = password, Group = group, Permissions = permissions, Database = database, Id = mLoginId };
string sval = Post("UpdateDatabaseUser", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
return result.Result;
WebApiUserInfo login = new WebApiUserInfo() { UserName = userName, Password = password, Group = group, Permissions = permissions, Database = database, Id = mLoginId };
string sval = Post("UpdateDatabaseUser", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
......@@ -783,20 +1209,33 @@ namespace DBDevelopClientWebApi
/// <param name="password"></param>
/// <param name="database"></param>
/// <returns></returns>
public bool ModifyDatabaseUserPassword(string userName,string password,string database)
public bool ModifyDatabaseUserPassword(string userName, string password, string database)
{
WebApiUserAndPassword login = new WebApiUserAndPassword() { UserName = userName, Password = password, Database = database, Id = mLoginId };
string sval = Post("ModifyDatabaseUserPassword", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
WebApiUserAndPassword login = new WebApiUserAndPassword() { UserName = userName, Password = password, Database = database, Id = mLoginId };
string sval = Post("ModifyDatabaseUserPassword", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
return result.Result;
LastErroMessage = ex.Message;
return false;
}
}
......@@ -806,20 +1245,33 @@ namespace DBDevelopClientWebApi
/// <param name="userName"></param>
/// <param name="database"></param>
/// <returns></returns>
public bool RemoveDatabaseUser(string userName,string database)
public bool RemoveDatabaseUser(string userName, string database)
{
WebApiUserRequest login = new WebApiUserRequest() { UserName = userName, Database = database, Id = mLoginId };
string sval = Post("RemoveDatabaseUser", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
return result.Result;
WebApiUserRequest login = new WebApiUserRequest() { UserName = userName, Database = database, Id = mLoginId };
string sval = Post("RemoveDatabaseUser", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
......@@ -835,18 +1287,31 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool NewDatabasePermission(string name, string desc, bool enableWriter, bool superPermission, List<string> group, string database)
{
WebApiNewDatabasePermissionRequest login = new WebApiNewDatabasePermissionRequest() { Name = name, Desc = desc, EnableWrite = enableWriter, SuperPermission = superPermission, Group = group, Database = database, Id = mLoginId };
string sval = Post("NewDatabasePermission", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
WebApiNewDatabasePermissionRequest login = new WebApiNewDatabasePermissionRequest() { Name = name, Desc = desc, EnableWrite = enableWriter, SuperPermission = superPermission, Group = group, Database = database, Id = mLoginId };
string sval = Post("NewDatabasePermission", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
return result.Result;
LastErroMessage = ex.Message;
return false;
}
}
......@@ -856,20 +1321,33 @@ namespace DBDevelopClientWebApi
/// <param name="permission"></param>
/// <param name="database"></param>
/// <returns></returns>
public bool RemoveDatabasePermission(string permission,string database)
public bool RemoveDatabasePermission(string permission, string database)
{
WebApiRemoveDatabasePermissionRequest login = new WebApiRemoveDatabasePermissionRequest() { Permission=permission, Database = database, Id = mLoginId };
string sval = Post("RemoveDatabasePermission", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
WebApiRemoveDatabasePermissionRequest login = new WebApiRemoveDatabasePermissionRequest() { Permission = permission, Database = database, Id = mLoginId };
string sval = Post("RemoveDatabasePermission", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
return result.Result;
LastErroMessage = ex.Message;
return false;
}
}
......@@ -885,18 +1363,31 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool UpdateDatabasePermission(string name, string desc, bool enableWriter, bool superPermission, List<string> group, string database)
{
WebApiNewDatabasePermissionRequest login = new WebApiNewDatabasePermissionRequest() { Name = name, Desc = desc, EnableWrite = enableWriter, SuperPermission = superPermission, Group = group, Database = database, Id = mLoginId };
string sval = Post("UpdateDatabasePermission", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
WebApiNewDatabasePermissionRequest login = new WebApiNewDatabasePermissionRequest() { Name = name, Desc = desc, EnableWrite = enableWriter, SuperPermission = superPermission, Group = group, Database = database, Id = mLoginId };
string sval = Post("UpdateDatabasePermission", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
return result.Result;
LastErroMessage = ex.Message;
return false;
}
}
......@@ -911,20 +1402,33 @@ namespace DBDevelopClientWebApi
/// <param name="username"></param>
/// <param name="password"></param>
/// <returns></returns>
public bool NewUser(string username,string password)
public bool NewUser(string username, string password)
{
WebApiNewSystemUserRequest login = new WebApiNewSystemUserRequest() { UserName = username,Password=password, Id = mLoginId };
string sval = Post("NewUser", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
WebApiNewSystemUserRequest login = new WebApiNewSystemUserRequest() { UserName = username, Password = password, Id = mLoginId };
string sval = Post("NewUser", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
return result.Result;
LastErroMessage = ex.Message;
return false;
}
}
......@@ -934,20 +1438,33 @@ namespace DBDevelopClientWebApi
/// <param name="oldName"></param>
/// <param name="newName"></param>
/// <returns></returns>
public bool ReNameUser(string oldName,string newName)
public bool ReNameUser(string oldName, string newName)
{
WebApiReNameSystemUserRequest login = new WebApiReNameSystemUserRequest() { OldName = oldName, NewName = newName, Id = mLoginId };
string sval = Post("ReNameUser", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
return result.Result;
WebApiReNameSystemUserRequest login = new WebApiReNameSystemUserRequest() { OldName = oldName, NewName = newName, Id = mLoginId };
string sval = Post("ReNameUser", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
......@@ -958,20 +1475,33 @@ namespace DBDevelopClientWebApi
/// <param name="password"></param>
/// <param name="newpassword"></param>
/// <returns></returns>
public bool ModifyPassword(string userName,string password,string newpassword)
public bool ModifyPassword(string userName, string password, string newpassword)
{
WebApiModifySystemUserPasswordRequest login = new WebApiModifySystemUserPasswordRequest() { UserName = userName, Password = password,NewPassword=newpassword, Id = mLoginId };
string sval = Post("ModifyPassword", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
return result.Result;
WebApiModifySystemUserPasswordRequest login = new WebApiModifySystemUserPasswordRequest() { UserName = userName, Password = password, NewPassword = newpassword, Id = mLoginId };
string sval = Post("ModifyPassword", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
......@@ -983,20 +1513,33 @@ namespace DBDevelopClientWebApi
/// <param name="newDatabasePerssion"></param>
/// <param name="database"></param>
/// <returns></returns>
public bool UpdateUser(string userName,bool isAdmin,bool newDatabasePerssion,List<string> database)
public bool UpdateUser(string userName, bool isAdmin, bool newDatabasePerssion, List<string> database)
{
WebApiUpdateSystemUserRequest login = new WebApiUpdateSystemUserRequest() { UserName = userName, IsAdmin = isAdmin, NewDatabasePermission = newDatabasePerssion,Databases=database, Id = mLoginId };
string sval = Post("ModifyPassword", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
return result.Result;
WebApiUpdateSystemUserRequest login = new WebApiUpdateSystemUserRequest() { UserName = userName, IsAdmin = isAdmin, NewDatabasePermission = newDatabasePerssion, Databases = database, Id = mLoginId };
string sval = Post("ModifyPassword", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
......@@ -1006,20 +1549,33 @@ namespace DBDevelopClientWebApi
/// <param name="username"></param>
/// <param name="password"></param>
/// <returns></returns>
public bool UpdateUserPassword(string username,string password)
public bool UpdateUserPassword(string username, string password)
{
WebApiNewSystemUserRequest login = new WebApiNewSystemUserRequest() { UserName = username, Password=password, Id = mLoginId };
string sval = Post("UpdateUserPassword", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
WebApiNewSystemUserRequest login = new WebApiNewSystemUserRequest() { UserName = username, Password = password, Id = mLoginId };
string sval = Post("UpdateUserPassword", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
return result.Result;
LastErroMessage = ex.Message;
return false;
}
}
......@@ -1029,18 +1585,31 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public List<WebApiSystemUserItem> GetUsers()
{
RequestBase login = new RequestBase() { Id = mLoginId };
string sval = Post("GetUsers", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<List<WebApiSystemUserItem>>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return null;
}
else
try
{
return result.Result;
RequestBase login = new RequestBase() { Id = mLoginId };
string sval = Post("GetUsers", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<List<WebApiSystemUserItem>>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return null;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return null;
}
}
......@@ -1051,18 +1620,31 @@ namespace DBDevelopClientWebApi
/// <returns></returns>
public bool RemoveUser(string userName)
{
WebApiRemoveSystemUserRequest login = new WebApiRemoveSystemUserRequest() { UserName = userName,Id = mLoginId };
string sval = Post("RemoveUser", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
if (string.IsNullOrEmpty(mLoginId))
{
LastErroMessage = result.ErroMsg;
LastErroMessage = "未登录";
return false;
}
else
try
{
return result.Result;
WebApiRemoveSystemUserRequest login = new WebApiRemoveSystemUserRequest() { UserName = userName, Id = mLoginId };
string sval = Post("RemoveUser", JsonConvert.SerializeObject(login));
var result = JsonConvert.DeserializeObject<ResultResponse<bool>>(sval);
if (result.HasErro)
{
LastErroMessage = result.ErroMsg;
return false;
}
else
{
return result.Result;
}
}
catch (Exception ex)
{
LastErroMessage = ex.Message;
return false;
}
}
......
......@@ -236,6 +236,18 @@ namespace DBDevelopClientWebApi
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
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
public object GetTagByGroup([FromBody] WebApiGetTagByGroupRequest request)
public object GetTagByGroup([FromBody] WebApiGetTagByGroupRequest request)
{
if (!CheckLoginId(request.Id, request.Database))
{
......@@ -450,7 +450,7 @@ namespace DBDevelopService.Controllers
int from = request.Index * PageCount;
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);
}
......@@ -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
public string ErroMsg { get; set; }
}
/// <summary>
///
/// </summary>
public class GetTagsByGroupResponse : ResultResponse
{
public int TotalPages { get; set; }
}
}
......@@ -37,7 +37,8 @@ namespace DevelopWebApiDemo
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)
{
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.
先完成此消息的编辑!
想要评论请 注册