diff --git a/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs b/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs index 74df2e7..4cd47b1 100644 --- a/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs +++ b/OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs @@ -16,17 +16,18 @@ using Infrastructure.Extensions; using DocumentFormat.OpenXml.Math; using Microsoft.Extensions.Configuration; using Infrastructure.CloudSdk.minio; -using Microsoft.AspNetCore.Http; namespace OpenAuth.App.ServiceApp { public class AirportMaintenanceApp : SqlSugarBaseApp { private readonly IConfiguration _configuration; + private readonly ISqlSugarClient _client; private readonly MinioService _minioService; - public AirportMaintenanceApp(ISugarUnitOfWork unitWork, MinioService minioService, 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; _minioService = minioService; } //获取设备绑定码 @@ -214,7 +215,6 @@ namespace OpenAuth.App.ServiceApp { using (var db = UnitWork.CreateContext()) { - info.Id = Guid.NewGuid().ToString(); var flag = await db.LasaFirmware.InsertAsync(info); if (db.Commit()) return new Response @@ -230,41 +230,6 @@ namespace OpenAuth.App.ServiceApp }; } } - //修改无人机或机场版本 - public async Task> UpdateFirmware(string id, string version, int type) - { - using (var db = UnitWork.CreateContext()) - { - if (type == 1) - { - var flag = await db.LasaDronePort.UpdateAsync(it => new LasaDronePort() - { - FirmwareVersion = version, - }, it => it.Id == id); - if (db.Commit()) - return new Response { Result = true, Message = "编辑成功" }; - else - return new Response { Result = false, Message = "编辑失败" }; - } - else - { - var flag = await db.LasaUav.UpdateAsync(it => new LasaUav() - { - FirmwareVersion = version, - }, it => it.Id == id); - if (db.Commit()) - return new Response { Result = true, Message = "编辑成功" }; - else - return new Response { Result = false, Message = "编辑失败" }; - } - - - } - } - public Task UploadFile(IFormFile xmlFile) - { - return _minioService.UploadFile(xmlFile, "firmware"); - } #endregion #region 健康报警 @@ -377,10 +342,10 @@ namespace OpenAuth.App.ServiceApp { Console.WriteLine(startTime.ToString()); var list = await db.LasaMediaFile.AsQueryable() - - .WhereIF(!string.IsNullOrEmpty(device), x => x.DroneModelKey == device) + + .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(startTime.ToString() ), x => x.CreateTime >= startTime) .WhereIF("0001/1/1 0:00:00".Equal(endTime.ToString()), x => x.CreateTime <= endTime) .OrderBy(x => x.CreateTime, OrderByType.Asc) .ToPageListAsync(page, limit, totalCount); @@ -391,6 +356,30 @@ namespace OpenAuth.App.ServiceApp } } + + public async Task> UpdatePicStatus(string id, int showOnMap, int display) + { + string sql = "update lasa_mediafile set \"ShowOnMap\"=" + showOnMap + ",display=" + display + " where \"Id\"='" + id+"'"; + await _client.Ado.ExecuteCommandAsync(sql); + return new Response { Result = "修改成功!" }; + } + + 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 objectkey = _client.Ado.SqlQuerySingle(sqlselect); + 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 efcaa69..efc94cc 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs @@ -675,5 +675,40 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers } return result; } + + + [HttpGet] + [AllowAnonymous] + public async Task> UpdatePicStatus(string id, int showOnMap,int display) + { + var result = new Response(); + try + { + result = await _app.UpdatePicStatus(id, showOnMap, display); + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.Message; + } + return result; + } + + [HttpGet] + [AllowAnonymous] + public async Task> deletepic(string ids) + { + var result = new Response(); + try + { + result = await _app.deletepic(ids); + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.Message; + } + return result; + } } }