|
|
|
@ -782,27 +782,34 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="req"></param>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public async Task<ResData> queryTaskStatus(string req, string secret)
|
|
|
|
|
public async Task<ResData> queryTaskStatus(string taskid)
|
|
|
|
|
{
|
|
|
|
|
ResData Response = new ResData();
|
|
|
|
|
|
|
|
|
|
//解密数据
|
|
|
|
|
byte[] secretbyte = Convert.FromBase64String(secret); //x-lc-secret
|
|
|
|
|
byte[] reqbyte = Convert.FromBase64String(req); //返回数据
|
|
|
|
|
string data = _helper.Decrypt(secretbyte, reqbyte);
|
|
|
|
|
|
|
|
|
|
//序列化返回数据并处理
|
|
|
|
|
var task = JsonSerializer.Deserialize<AirPortTaskReq>(data);
|
|
|
|
|
string sql = "select * from drone_docktask where taskid=" + data;
|
|
|
|
|
|
|
|
|
|
Response.Code = 205;
|
|
|
|
|
var taskinfo = await _client.Queryable<DroneDocktask>().Where(r => r.taskid == taskid).FirstAsync();
|
|
|
|
|
if (taskinfo != null)
|
|
|
|
|
{
|
|
|
|
|
if (taskinfo.state == 0)
|
|
|
|
|
{
|
|
|
|
|
Response.Code = 201;
|
|
|
|
|
}else if (taskinfo.state == 1)
|
|
|
|
|
{
|
|
|
|
|
Response.Code = 202;
|
|
|
|
|
}else if(taskinfo.state == 2)
|
|
|
|
|
{
|
|
|
|
|
Response.Code = 202;
|
|
|
|
|
}else if( taskinfo.state == 3)
|
|
|
|
|
{
|
|
|
|
|
Response.Code = 204;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
string x_lc_secret = _helper.getxseret();
|
|
|
|
|
// 转换为字节数组
|
|
|
|
|
byte[] bytes = Encoding.UTF8.GetBytes(sql);
|
|
|
|
|
byte[] bytes = Encoding.UTF8.GetBytes(taskid);
|
|
|
|
|
var encryptedResData = _helper.Encrypt(bytes);
|
|
|
|
|
Response.Result = encryptedResData;
|
|
|
|
|
Response.Message = "查询无人机机场任务状态成功!";
|
|
|
|
|
Response.Code = 200;
|
|
|
|
|
Response.Secret = x_lc_secret;
|
|
|
|
|
return Response;
|
|
|
|
|
}
|
|
|
|
@ -1396,8 +1403,13 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
|
|
|
|
|
throw new Exception("上传信息写入数据库失败");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
await uow.DroneDocktask.UpdateAsync(r => new DroneDocktask()
|
|
|
|
|
{
|
|
|
|
|
state = 2
|
|
|
|
|
}, r => r.id == task.id);
|
|
|
|
|
|
|
|
|
|
uow.Commit();
|
|
|
|
|
Console.WriteLine(info);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//上传db包
|
|
|
|
|