状态获取接口修改

main
洁 任 2 days ago
parent 1ebcd807c4
commit 7597984a64

@ -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包

@ -370,7 +370,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <param name="req"></param>
/// <returns></returns>
[Route("/zhcfzx/droneAirport/queryTaskStatus")]
[HttpPost]
[HttpGet]
[AllowAnonymous]
public async Task<ReciveData<string>> queryTaskStatus(string taskid)
{
@ -386,18 +386,10 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
string secret = secretValue.ToString();
try
{
// 1. 从请求体中直接读取原始字符串(即 encryptedData
string req;
using (var reader = new StreamReader(Request.Body, Encoding.UTF8))
{
req = await reader.ReadToEndAsync();
}
var data = await _app.queryTaskStatus(req, secret);
var data = await _app.queryTaskStatus(taskid);
result.data = data.Result;
result.code = data.Code;
result.message = data.Message;
//Request.Headers.TryGetValue("traceid", out var traceid);
//result.traceid = traceid;
result.traceid = Guid.NewGuid().ToString();
Response.Headers.Add("x-lc-secret", data.Secret);
}
@ -405,8 +397,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
{
result.code = 200;
result.message = "error";
//Request.Headers.TryGetValue("traceid", out var traceid);
//result.traceid = traceid;
result.traceid = Guid.NewGuid().ToString();
}
return result;

@ -84,8 +84,8 @@
},
"DroneDocking": {
"Url": "https://wp.tianmu.cloud:5443/zhcfzx",
"DbFile": "D:\\",
"JYMUrl": "E:\\低空态势感知\\资料\\省对接\\质检\\LandCloud.CGDBPreCheckTool.exe"
"DbFile": "D:/",
"JYMUrl": "E:/低空态势感知/资料/省对接/质检/LandCloud.CGDBPreCheckTool.exe"
},
"AIModelApi":{
"Url": "http://192.168.10.131:9025",

@ -3,10 +3,10 @@
"code": "AirportData",
"count": "0",
"extension": "db",
"hash": "81B6A5092EE430D7CA7B76A161FFADB46E3482DFF632EBAA1A21CB4DBCE6B5C5",
"hash": "25FBDC0C75E0EEFC531474430C4F4FF12AA08C2BF8DA9C53DCB2FBDE23AB2C4E",
"regioncode": "370000",
"sign": "32048FEC0D8117C51EBD1F8058BD21F703BFB9EE9FF94190BD661DB1CEA636F6EF9C4CA7F13398DC92472E283D739B14B35B9FDB775ED974F908F7E4F13E20C6",
"sign": "6DC82902D95BF1BC7CE40E931D3A6D06BF015B5C082841476718AE038BC23C48842DE7757BD05A625BF526256110273FCE57A156CB96B5CA478A1C4C097D49DB",
"size": "26650624",
"timestamp": "1757061411",
"timestamp": "1757124448",
"version": "1"
}

Loading…
Cancel
Save