From 957e73c6f15db7097a26d3b0100a638908557cfa Mon Sep 17 00:00:00 2001 From: zhangbin <460190368@qq.com> Date: Tue, 22 Jul 2025 15:25:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=88=97=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0sn=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServiceApp/AirportMaintenanceApp.cs | 17 +++++++++-------- .../AirportMaintenanceController.cs | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs b/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs index d901301..cee9c87 100644 --- a/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs +++ b/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs @@ -25,7 +25,7 @@ namespace OpenAuth.App.ServiceApp private readonly IConfiguration _configuration; private readonly ISqlSugarClient _client; private readonly MinioService _minioService; - public AirportMaintenanceApp(MinioService minioService,ISqlSugarClient client,ISugarUnitOfWork unitWork, IConfiguration configuration, ISimpleClient repository, IAuth auth) : base(unitWork, repository, auth) + public AirportMaintenanceApp(MinioService minioService, ISqlSugarClient client, ISugarUnitOfWork unitWork, IConfiguration configuration, ISimpleClient repository, IAuth auth) : base(unitWork, repository, auth) { _configuration = configuration; _client = client; @@ -308,7 +308,7 @@ namespace OpenAuth.App.ServiceApp } } //根据时间获取告警信息列表 - public async Task>>> GetManageDeviceHmsList(int level, int model, DateTime startTime, DateTime endTime, int page, int limit, string message) + public async Task>>> GetManageDeviceHmsList(int level, int model, DateTime startTime, DateTime endTime, int page, int limit, string message, string getway) { RefAsync totalCount = 0; using (var db = UnitWork.CreateContext()) @@ -318,6 +318,7 @@ namespace OpenAuth.App.ServiceApp .WhereIF(level != 0, x => x.Level == level) .WhereIF(model != 0, x => x.Module == model) .WhereIF(!string.IsNullOrEmpty(message), x => x.MessageZh.Contains(message)) + .WhereIF(!string.IsNullOrEmpty(getway), x => x.Sn == getway) .OrderBy(x => x.CreateTime, OrderByType.Desc) .ToPageListAsync(page, limit, totalCount); return new Response>> @@ -383,7 +384,7 @@ namespace OpenAuth.App.ServiceApp .WhereIF(!string.IsNullOrEmpty(device), x => x.DroneModelKey == device) .WhereIF(!string.IsNullOrEmpty(picname), x => x.Name.Contains(picname)) .WhereIF(!"0001/1/1 0:00:00".Equal(startTime.ToString()), x => x.CreateTime >= startTime) - .WhereIF(!"0001/1/1 0:00:00".Equal(endTime.ToString()), x => x.CreateTime <= endTime) + .WhereIF(!"0001/1/1 0:00:00".Equal(endTime.ToString()), x => x.CreateTime <= endTime) .WhereIF(!string.IsNullOrEmpty(parentKey), x => x.ParentKey == parentKey) .OrderBy(x => x.CreateTime, OrderByType.Asc) .ToPageListAsync(page, limit, totalCount); @@ -397,7 +398,7 @@ namespace OpenAuth.App.ServiceApp public async Task> UpdatePicStatus(string id, int showOnMap, int display, string fileTags, string graffitiJson) { - string sql = "update lasa_mediafile set \"ShowOnMap\"=" + showOnMap + ",display=" + display+ ",\"FileTags\"='" + fileTags + "',\"GraffitiJson\"='" + graffitiJson + "' where \"Id\"='" + id+"'"; + string sql = "update lasa_mediafile set \"ShowOnMap\"=" + showOnMap + ",display=" + display + ",\"FileTags\"='" + fileTags + "',\"GraffitiJson\"='" + graffitiJson + "' where \"Id\"='" + id + "'"; await _client.Ado.ExecuteCommandAsync(sql); return new Response { Result = "修改成功!" }; } @@ -405,15 +406,15 @@ namespace OpenAuth.App.ServiceApp public async Task> deletepic(string ids) { string[] idarray = ids.Split(","); - + for (int i = 0; i < idarray.Length; i++) { - string sqlselect = "select \"ObjectKey\" from lasa_mediafile where \"Id\"='"+idarray[i]+"'"; + string sqlselect = "select \"ObjectKey\" from lasa_mediafile where \"Id\"='" + idarray[i] + "'"; string objectkey = _client.Ado.SqlQuerySingle(sqlselect); - string sql = "delete from lasa_mediafile where \"Id\"='"+idarray[i]+"'"; + string sql = "delete from lasa_mediafile where \"Id\"='" + idarray[i] + "'"; await _client.Ado.ExecuteCommandAsync(sql); await _minioService.DeleteFile(objectkey); - + } return new Response { Result = "删除成功!" }; diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs index e823e9e..f8b9cac 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs @@ -614,12 +614,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers /// /// [HttpGet] - public async Task>>> GetManageDeviceHmsList(int level, int model, DateTime startTime, DateTime endTime, int page, int limit, string message) + public async Task>>> GetManageDeviceHmsList(int level, int model, DateTime startTime, DateTime endTime, int page, int limit, string message,string getway) { var result = new Response>>(); try { - result = await _app.GetManageDeviceHmsList(level, model, startTime, endTime, page, limit, message); + result = await _app.GetManageDeviceHmsList(level, model, startTime, endTime, page, limit, message, getway); } catch (Exception ex) {