Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/LASAPlatform

OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs

@@ -396,9 +396,9 @@ namespace OpenAuth.App.ServiceApp
         }
 
 
-        public async Task<Response<string>> UpdatePicStatus(string id, int showOnMap, int display)
+        public async Task<Response<string>> UpdatePicStatus(string id, int showOnMap, int display, string fileTags, string graffitiJson)
         {
-            string sql = "update lasa_mediafile set \"ShowOnMap\"=" + showOnMap + ",display=" + display + " where \"Id\"='" + id+"'";
+            string sql = "update lasa_mediafile set \"ShowOnMap\"=" + showOnMap + ",display=" + display+ ",\"file_tags\"='"+fileTags + ",display='" + display + "',\"graffitiJson\"='" + graffitiJson + "' where \"Id\"='" + id+"'";
             await _client.Ado.ExecuteCommandAsync(sql);
             return new Response<string> { Result = "修改成功!" };
         }
@@ -419,6 +419,21 @@ namespace OpenAuth.App.ServiceApp
             }
             return new Response<string> { Result = "删除成功!" };
         }
+
+
+        public async Task<Response<string>> UpdatePicName(string id, string name)
+        {
+            string sql = "update lasa_mediafile set \"Name\"='" + name + "'  where \"Id\"='" + id + "'";
+            await _client.Ado.ExecuteCommandAsync(sql);
+            return new Response<string> { Result = "修改成功!" };
+        }
+
+        public async Task<Response<string>> UpdatePicParentKey(string id, string ParentKey)
+        {
+            string sql = "update lasa_mediafile set \"Name\"='" + ParentKey + "'  where \"Id\"='" + id + "'";
+            await _client.Ado.ExecuteCommandAsync(sql);
+            return new Response<string> { Result = "修改成功!" };
+        }
     }
 
 

OpenAuth.App/ServiceApp/DroneDocking/Response/DroneDockRes.cs

@@ -0,0 +1,56 @@
+using OpenAuth.Repository.Domain;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.DroneDocking.Response
+{
+    public class DroneDockRes
+    {
+        public string id { get; set; }
+
+        /// <summary>
+        /// Desc:无人机机场设备唯一id（多个）
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string deviceid { get; set; }
+
+        /// <summary>
+        /// Desc:业务类型，用于标识数据来源
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string bizidname { get; set; }
+
+        /// <summary>
+        /// Desc:下发任务名称
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string taskname { get; set; }
+
+        /// <summary>
+        /// Desc:下发任务id
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string taskid { get; set; }
+
+        /// <summary>
+        /// Desc:数据类型，	用于后续成果上传获取上传路径
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string datacode { get; set; }
+        /// <summary>
+        /// 任务是否开始执行（0未开始，1已开始，2已完成，3已取消）
+        /// </summary>
+        public int state { get; set; }
+
+        public DateTime? createtime { get; set; }
+        public List<DroneDocktaskdetail> tasklist { get; set; }
+    }
+}

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -422,13 +422,44 @@ namespace OpenAuth.App.ServiceApp
                 return new Response<bool> { Result = false, Message = "任务不存在" };
             }
 
-            if (task.CompletedTime != null) // 定时任务
+            if (task.CompletedTime != null) // 已完成任务（无论成功失败）
             {
                 return new Response<bool> { Result = false, Message = "已完成任务禁止删除" };
             }
 
             using (var db = UnitWork.CreateContext())
             {
+                // todo 如果任务已经开始取消任务
+                if (task.Status.Equals(1))
+                {
+                    var flightId = task.FlightId;
+                    if (!string.IsNullOrEmpty(flightId))
+                    {
+                        var dronePort = await Repository.ChangeRepository<SugarRepositiry<LasaDronePort>>()
+                            .GetByIdAsync(task.TaskDronePort);
+                        if (dronePort == null)
+                        {
+                            throw new Exception("指定机场不存在");
+                        }
+
+                        var serialNo = dronePort.Sn;
+                        // 取消任务
+                        var cancelTaskTopic = $"thing/product/{serialNo}/services";
+                        var cancelTaskRequest = new TopicServicesRequest<object>()
+                        {
+                            method = "flighttask_undo",
+                            tid = Guid.NewGuid().ToString(),
+                            bid = Guid.NewGuid().ToString(),
+                            timestamp = DateTimeOffset.Now.ToUnixTimeMilliseconds(),
+                            data = new
+                            {
+                                flight_ids = new[] { task.FlightId }
+                            }
+                        };
+                        await _mqttClientManager.PublishAsync(cancelTaskTopic,
+                            JsonConvert.SerializeObject(cancelTaskRequest));
+                    }
+                }
                 var flag = await db.LasaTask.DeleteAsync(it => it.Id == id);
                 var taskId = task.Id;
                 var mediaFileList = await db.LasaMediaFile.AsQueryable()
@@ -509,7 +540,8 @@ namespace OpenAuth.App.ServiceApp
                 {
                     // http://175.27.168.120:6013/test/2025061617111990020017.wpml
                     var wmpl = oldLasaAirLine.WPML;
-                    await _minioService.DeleteFile(wmpl);
+                    //  为保存副本不再删除旧的航线
+                    //await _minioService.DeleteFile(wmpl);
                     return new Response<bool> { Result = true, Message = "编辑成功" };
                 }
 

OpenAuth.App/ServiceApp/Subscribe/ConfigSubscribe.cs

@@ -157,7 +157,7 @@ public class ConfigSubscribe : IJob
                         // eb87b257-5af1-4bf1-9aba-4267be9fdb12 flight 
                         // http://175.27.168.120:6013/test/2025062209390863860047.kmz
                         // md5  585c833012ddb794eaac1050ef71aa31
-                        // todo 这一小段运行异常
+                        // 这一小段运行异常
                         var taskAssign = await _sqlSugarClient
                             .Queryable<LasaTaskAssign>()
                             .Where(x => x.FlightId == flightId)
@@ -208,12 +208,16 @@ public class ConfigSubscribe : IJob
                         int flightType = data.flight_task.flight_type;
                         if (flightType == 1) // 不处理一键起飞媒体信息
                         {
+                            // todo 后续可能要存
                             break;
                         }
 
                         string flightId = data.file.ext.flight_id;
-                        var taskAssgin = _manageApp.GetTaskAssignByFlightId(flightId);
-                        var taskId = taskAssgin.TaskId;
+                        var taskAssign = _manageApp.GetTaskAssignByFlightId(flightId);
+                        var taskId = taskAssign.TaskId;
+                        var executeTask = await _sqlSugarClient
+                            .Queryable<LasaTask>()
+                            .SingleAsync(a => a.Id == taskId);
                         string objectKey = data.file.object_key;
                         var folderKey = ((string)data.file.object_key).Split("/");
                         var parentKey = folderKey[^2];
@@ -230,7 +234,7 @@ public class ConfigSubscribe : IJob
                                 TaskId = taskId,
                                 ParentKey = "",
                                 ObjectKey = folderKey[0],
-                                WorkspaceId = "", // todo 从任务中取来
+                                WorkspaceId = executeTask.WorkspaceId, // todo 从任务中取来
                                 Level = 1,
                             };
                             parents.Add(parent1);
@@ -241,7 +245,7 @@ public class ConfigSubscribe : IJob
                                 TaskId = taskId,
                                 ParentKey = folderKey[0],
                                 ObjectKey = folderKey[1],
-                                WorkspaceId = "",
+                                WorkspaceId = executeTask.WorkspaceId,
                                 Level = 2,
                             };
                             parents.Add(parent1);
@@ -252,7 +256,7 @@ public class ConfigSubscribe : IJob
                                 TaskId = taskId,
                                 ParentKey = folderKey[1],
                                 ObjectKey = folderKey[2],
-                                WorkspaceId = "",
+                                WorkspaceId = executeTask.WorkspaceId,
                                 Level = 3,
                             };
                             parents.Add(parent1);
@@ -270,7 +274,7 @@ public class ConfigSubscribe : IJob
                             {
                                 Id = Guid.NewGuid().ToString(),
                                 FlightId = flightId, // 计划id
-                                TaskId = taskAssgin.TaskId, // 任务id 
+                                TaskId = taskAssign.TaskId, // 任务id 
                                 DroneModelKey = data.file.ext.drone_model_key, // 无人机型号
                                 IsOriginal = data.file.ext.is_original,
                                 MediaIndex = data.file.ext.media_index,
@@ -284,6 +288,7 @@ public class ConfigSubscribe : IJob
                                 ObjectKey = data.file.object_key,
                                 Path = data.file.path, // 目前这个好像没有值
                                 CreateTime = ((string)data.file.metadata.created_time).ToDateTime(),
+                                WorkspaceId = executeTask.WorkspaceId,
                                 ParentKey = folderKey[2],
                                 Level = 4
                             };

OpenAuth.Repository/Domain/DroneDocktaskdetail.cs

@@ -92,6 +92,7 @@ namespace OpenAuth.Repository.Domain
            /// Nullable:True
            /// </summary>           
            public string taskid {get;set;}
-
+           //飞行任务id
+           public string flighttaskid { get;set;}
     }
 }

OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs

@@ -679,12 +679,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
 
         [HttpGet]
         [AllowAnonymous]
-        public async Task<Response<string>> UpdatePicStatus(string id, int showOnMap,int display)
+        public async Task<Response<string>> UpdatePicStatus(string id, int showOnMap,int display,string fileTags,string graffitiJson)
         {
             var result = new Response<string>();
             try
             {
-                result = await _app.UpdatePicStatus(id, showOnMap, display);
+                result = await _app.UpdatePicStatus(id, showOnMap, display,fileTags,graffitiJson);
             }
             catch (Exception ex)
             {
@@ -710,5 +710,41 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
             }
             return result;
         }
+
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<Response<string>> UpdatePicName(string id, string name)
+        {
+            var result = new Response<string>();
+            try
+            {
+                result = await _app.UpdatePicName(id, name);
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.Message;
+            }
+            return result;
+        }
+
+
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<Response<string>> UpdatePicParentKey(string id, string ParentKey)
+        {
+            var result = new Response<string>();
+            try
+            {
+                result = await _app.UpdatePicParentKey(id, ParentKey);
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.Message;
+            }
+            return result;
+        }
+
     }
 }

OpenAuth.WebApi/Controllers/ServiceControllers/DroneDockController.cs

@@ -403,5 +403,39 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
             }
 
         }
+
+        /// <summary>
+        /// 校验token
+        /// </summary>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [AllowAnonymous]
+        public  Response<bool> VerifyToken(string token)
+        {
+            Response<bool> result= new Response<bool>();
+            try
+            {
+                var tokenflag = _helper.Verify(token);
+                if (tokenflag)
+                {
+                    result.Message = "校验成功";
+                    result.Result = true;
+                }
+                else
+                {
+                    result.Message = "校验失败";
+                    result.Result = false;
+                    result.Code = 500;
+                }
+                return result ;
+            }
+            catch (Exception ex) 
+            {
+                result.Code = 500;
+                result.Message = "error";
+                return result;
+            }     
+        }
     }
 }