diff --git a/OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs b/OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs index 92fc982..3da221c 100644 --- a/OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs +++ b/OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs @@ -246,7 +246,7 @@ namespace OpenAuth.App.ServiceApp.DroneDocking /// /// /// - public async Task> Test(AirPortUpdateTaskReq req) + public async Task> Test(AirPortTaskReq req) { Response Response = new Response(); @@ -257,7 +257,7 @@ namespace OpenAuth.App.ServiceApp.DroneDocking { try { - string url = "http://localhost:10042/zhcfzx/droneAirport/updateTask"; + string url = "http://localhost:10042/zhcfzx/droneAirport/AddTask"; string x_lc_secret = _helper.getxseret(); string centercode = "UAV32_LJY2FPMYDE6UDES3P3ZD7V3IKQ"; string x_token = "API32_HENJOZMPBYKEXNVLFMY3Y5W5SQ.1751622229582.fmCjIucQYyq4YZe4CnSStN/rHcwjZTxUsDuXeXJfrYn0bwoaV1/IW8mcFwtLw8JHjowvMJrmPyy/QZAhssxQCQ=="; @@ -417,7 +417,7 @@ namespace OpenAuth.App.ServiceApp.DroneDocking { //查询数据 检查是否有重复数据 var info = uow.DroneDocktask.AsQueryable().Where(r => r.taskid == task.taskid).First(); - if (info != null) + if (info == null) { //本地数据库数据添加 await uow.DroneDocktask.InsertAsync(dt); diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneDockController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneDockController.cs index b915ca3..1019566 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneDockController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneDockController.cs @@ -93,14 +93,14 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers } - [HttpGet] + [HttpPost] [AllowAnonymous] - public async Task> Test(string taskid) + public async Task> Test(AirPortTaskReq req) { var result = new Response(); try { - result = await _app.Test1(taskid); + result = await _app.Test(req); } catch (Exception ex) { @@ -143,16 +143,18 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers result.data = data.Result; result.code=data.Code; result.message = data.Message; - Request.Headers.TryGetValue("traceid", out var traceid); - result.traceid = traceid; + //Request.Headers.TryGetValue("traceid", out var traceid); + //result.traceid = traceid; + result.traceid = Guid.NewGuid().ToString(); Response.Headers.Add("x-lc-secret", data.Secret); } catch (Exception ex) { result.code = 200; result.message = "error"; - Request.Headers.TryGetValue("traceid", out var traceid); - result.traceid = traceid; + //Request.Headers.TryGetValue("traceid", out var traceid); + //result.traceid = traceid; + result.traceid = Guid.NewGuid().ToString(); } return result; } @@ -206,16 +208,18 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers result.data = data.Result; result.code = data.Code; result.message = data.Message; - Request.Headers.TryGetValue("traceid", out var traceid); - result.traceid = traceid; + //Request.Headers.TryGetValue("traceid", out var traceid); + //result.traceid = traceid; + result.traceid = Guid.NewGuid().ToString(); Response.Headers.Add("x-lc-secret", data.Secret); } catch (Exception ex) { result.code = 200; result.message = "error"; - Request.Headers.TryGetValue("traceid", out var traceid); - result.traceid = traceid; + //Request.Headers.TryGetValue("traceid", out var traceid); + //result.traceid = traceid; + result.traceid = Guid.NewGuid().ToString(); } return result; } @@ -258,16 +262,18 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers result.data = data.Result; result.code = data.Code; result.message = data.Message; - Request.Headers.TryGetValue("traceid", out var traceid); - result.traceid = traceid; + //Request.Headers.TryGetValue("traceid", out var traceid); + //result.traceid = traceid; + result.traceid = Guid.NewGuid().ToString(); Response.Headers.Add("x-lc-secret", data.Secret); } catch (Exception ex) { result.code = 200; result.message = "error"; - Request.Headers.TryGetValue("traceid", out var traceid); - result.traceid = traceid; + //Request.Headers.TryGetValue("traceid", out var traceid); + //result.traceid = traceid; + result.traceid = Guid.NewGuid().ToString(); } return result; } @@ -301,16 +307,18 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers result.data = data.Result; result.code = data.Code; result.message = data.Message; - Request.Headers.TryGetValue("traceid", out var traceid); - result.traceid = traceid; + //Request.Headers.TryGetValue("traceid", out var traceid); + //result.traceid = traceid; + result.traceid = Guid.NewGuid().ToString(); Response.Headers.Add("x-lc-secret", data.Secret); } catch (Exception ex) { result.code = 200; result.message = "error"; - Request.Headers.TryGetValue("traceid", out var traceid); - result.traceid = traceid; + //Request.Headers.TryGetValue("traceid", out var traceid); + //result.traceid = traceid; + result.traceid = Guid.NewGuid().ToString(); } return result; } @@ -377,16 +385,18 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers result.data = data.Result; result.code = data.Code; result.message = data.Message; - Request.Headers.TryGetValue("traceid", out var traceid); - result.traceid = traceid; + //Request.Headers.TryGetValue("traceid", out var traceid); + //result.traceid = traceid; + result.traceid = Guid.NewGuid().ToString(); Response.Headers.Add("x-lc-secret", data.Secret); } catch (Exception ex) { result.code = 200; result.message = "error"; - Request.Headers.TryGetValue("traceid", out var traceid); - result.traceid = traceid; + //Request.Headers.TryGetValue("traceid", out var traceid); + //result.traceid = traceid; + result.traceid = Guid.NewGuid().ToString(); } return result; } @@ -523,16 +533,18 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers result.data = data.Result; result.code = data.Code; result.message = data.Message; - Request.Headers.TryGetValue("traceid", out var traceid); - result.traceid = traceid; + //Request.Headers.TryGetValue("traceid", out var traceid); + //result.traceid = traceid; + result.traceid = Guid.NewGuid().ToString(); Response.Headers.Add("x-lc-secret", data.Secret); } catch (Exception ex) { result.code = 200; result.message = "error"; - Request.Headers.TryGetValue("traceid", out var traceid); - result.traceid = traceid; + //Request.Headers.TryGetValue("traceid", out var traceid); + //result.traceid = traceid; + result.traceid = Guid.NewGuid().ToString(); } return result; }