From fa83ca30c160fb244320faa68a259e064630fd8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E4=BC=9F?= <421281095@qq.com> Date: Fri, 31 Oct 2025 09:12:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(manage):=20=E6=96=B0=E5=A2=9E=E6=97=A0?= =?UTF-8?q?=E4=BA=BA=E6=9C=BA=E6=9C=BA=E5=9C=BA=E4=BF=A1=E6=81=AF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.App/ServiceApp/ManageApp.cs | 33 ++++++++++++++++--- .../ServiceControllers/ManageController.cs | 6 ++++ 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/OpenAuth.App/ServiceApp/ManageApp.cs b/OpenAuth.App/ServiceApp/ManageApp.cs index 4bf9f08..16914ec 100644 --- a/OpenAuth.App/ServiceApp/ManageApp.cs +++ b/OpenAuth.App/ServiceApp/ManageApp.cs @@ -4,8 +4,8 @@ using System.Drawing; using System.Dynamic; using System.Net; using System.Text; -using DocumentFormat.OpenXml.Office2010.Excel; using Infrastructure; +using Infrastructure.Cache; using Infrastructure.CloudSdk; using Infrastructure.CloudSdk.minio; using Infrastructure.CloudSdk.wayline; @@ -16,12 +16,9 @@ using MetadataExtractor.Formats.Exif; using MetadataExtractor.Formats.Xmp; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; -using Microsoft.IdentityModel.Tokens; -using Microsoft.Net.Http.Headers; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using OpenAuth.App.BaseApp.Base; -using OpenAuth.App.BaseApp.Subscribe; using OpenAuth.App.BasicQueryService; using OpenAuth.App.Interface; using OpenAuth.App.Request; @@ -50,9 +47,11 @@ namespace OpenAuth.App.ServiceApp private readonly ConcurrentDictionary _processedMessages = new(); private readonly TimeSpan _deduplicationWindow = TimeSpan.FromMinutes(1); + private readonly RedisCacheContext _redisCacheContext; + public ManageApp(ISugarUnitOfWork unitWork, ISimpleClient repository, IAuth auth, MqttClientManager mqttClientManager, CommonDataManager commonDataManager, MinioService minioService, - OpenJobApp openJobApp, ILogger logger) + OpenJobApp openJobApp, ILogger logger, RedisCacheContext redisCacheContext) : base(unitWork, repository, auth) { _mqttClientManager = mqttClientManager; @@ -60,6 +59,7 @@ namespace OpenAuth.App.ServiceApp _commonDataManager = commonDataManager; _openJobApp = openJobApp; _logger = logger; + _redisCacheContext = redisCacheContext; } #region 机场管理 @@ -2936,5 +2936,28 @@ WHERE Result = x }; } + + public async Task> GetDronePortInfo(string dronePortSn) + { + var info = _redisCacheContext.Get(dronePortSn); + var infoObj = JObject.Parse(info); + var modeCode = infoObj["mode_code"]?.ToString(); + var droneInDock = infoObj["drone_in_dock"]?.ToString(); + if (modeCode != null && droneInDock != null) + { + return new Response + { + Result = new + { + modeCode, droneInDock + } + }; + } + return new Response + { + Message = "查询失败", + Code = 500 + }; + } } } \ No newline at end of file diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs index d65ad26..47fdf31 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs @@ -986,5 +986,11 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers { return await _app.ListDronePort(lng, lat); } + // todo + [HttpGet] + public async Task> GetDronePortInfo(string dronePortSn) + { + return await _app.GetDronePortInfo(dronePortSn); + } } } \ No newline at end of file From 06896f69247fb940bc6b1abe06a519d93f813253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E4=BC=9F?= <421281095@qq.com> Date: Fri, 31 Oct 2025 09:14:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(auth):=20=E5=85=81=E8=AE=B8=E5=8C=BF?= =?UTF-8?q?=E5=90=8D=E8=AE=BF=E9=97=AE=E6=97=A0=E4=BA=BA=E6=9C=BA=E5=9C=BA?= =?UTF-8?q?=E5=8F=A3=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ServiceControllers/ManageController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs index 47fdf31..0980f80 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs @@ -988,6 +988,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers } // todo [HttpGet] + [AllowAnonymous] public async Task> GetDronePortInfo(string dronePortSn) { return await _app.GetDronePortInfo(dronePortSn);