上传修改

OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs

@@ -840,7 +840,7 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
             return Response;
         }
 
-        public Response<string> UploadFile(AirPortUploadDbReq req)
+        public async Task<Response<string>> UploadFile(AirPortUploadDbReq req)
         {
             Response<string> Response = new Response<string>();
             var filePath = req.filePath;
@@ -862,7 +862,7 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
                 fileContent.Headers.ContentDisposition.FileName = fileName;
                 //注意：务必 根据 文件扩展名，这里指定 ContentType
                 fileContent.Headers.ContentType = new
-                MediaTypeHeaderValue(fileName);
+                MediaTypeHeaderValue("application/octet-stream");
                 formData.Add(fileContent);
                 var request = new HttpRequestMessage
                 {
@@ -919,8 +919,8 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
         }
 
           public async void InsertDb(string taskid) {
-
-                string _sqliteConnection = "DataSource = E:\\Program Files (x86)\\DingDing\\DTalkFIle\\(371325)费县_20250628155400093.db; Version = 3; ";
+         var sqliteconnect  =    configuration.GetSection("DroneDocking:DbFile").Value;
+            string _sqliteConnection = "DataSource = "+ sqliteconnect + "; Version = 3; ";
                 string sql = "select * from drone_docktaskdetail where taskid='" + taskid + "'";
                 var filigtlist = _client.Ado.SqlQuery<DroneDocktaskdetail>(sql);
             using (var sqliteConn = new SQLiteConnection(_sqliteConnection))
@@ -1035,38 +1035,45 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
                         }
                     }
                 }
-                AirPortUploadReq airPortUploadReq = new AirPortUploadReq();
-                airPortUploadReq.code = "AirportData";
-                airPortUploadReq.regioncode = filigtlist[0].xzqdm;
-                List<string> strings = new List<string>();
-                strings.Add(filigtlist[0].xzqdm + ".db");
-                airPortUploadReq.filenames = strings;
-                var result =  await getUploadFilePath(airPortUploadReq);
-                var jsonstr = result.Result;
-                JObject jObject = JObject.Parse(jsonstr);
-                var liststr = jObject["data"].Value<List<JObject>>();
-                var write = liststr[0]["writeurl"].ToString();
-                var read = liststr[0]["readurl"].ToString();
-                AirPortUploadDbReq req = new AirPortUploadDbReq();
-                req.fileUrl = write;
-                req.filePath =  configuration.GetSection("DroneDocking:DbFile").Value;
-                req.filename = filigtlist[0].xzqdm + ".db";
-                UploadFile(req);
-                using (var uow = base.UnitWork.CreateContext())
-                {
-                    DbfineInfo dbfine = new DbfineInfo();
-                    dbfine.id = Guid.NewGuid().ToString();
-                    dbfine.taskid = taskid;
-                    dbfine.regioncode = filigtlist[0].xzqdm;
-                    dbfine.extension = ".db";
-                    dbfine.attachment_count = 1;
-                    dbfine.hash = "3jekd4k3k5554k3l2l4kj6kl";
-                    dbfine.size = 1000;
-                    dbfine.count = 50;
-                    var info = uow.DbfineInfo.Insert(dbfine);
-                }
+                sqliteConn.Close();
+             
                 }
-      }
+            AirPortUploadReq airPortUploadReq = new AirPortUploadReq();
+            airPortUploadReq.code = "AirportData";
+            airPortUploadReq.regioncode = filigtlist[0].xzqdm;
+            List<string> strings = new List<string>();
+            strings.Add(filigtlist[0].xzqdm + ".db");
+            airPortUploadReq.filenames = strings;
+            var result = await getUploadFilePath(airPortUploadReq);
+            var jsonstr = result.Result;
+            JArray jObject = JArray.Parse(jsonstr);
+            var liststr = jObject[0].Value<JObject>();
+            var write = liststr["writeurl"].ToString();
+            var read = liststr["readurl"].ToString();
+            AirPortUploadDbReq req = new AirPortUploadDbReq();
+            req.fileUrl = write;
+            req.filePath = configuration.GetSection("DroneDocking:DbFile").Value;
+            req.filename = filigtlist[0].xzqdm + ".db";
+            using (var uow = base.UnitWork.CreateContext())
+            {
+                DbfineInfo dbfine = new DbfineInfo();
+                dbfine.id = Guid.NewGuid().ToString();
+                dbfine.taskid = taskid;
+                dbfine.regioncode = filigtlist[0].xzqdm;
+                dbfine.extension = ".db";
+                dbfine.attachment_count = 1;
+                dbfine.size = 1000;
+                dbfine.count = 50;
+                dbfine.url = read;
+                dbfine.hashcode = "adewfdafdaf";
+                var info = await uow.DbfineInfo.InsertAsync(dbfine);
+                
+                uow.Commit();
+                Console.WriteLine(info);
+            }
+            await UploadFile(req);
+          
+        }
         // 安全获取响应头值的方法
         private static string GetHeaderValue(HttpResponseMessage response, string headerName)
         {

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -1887,9 +1887,9 @@ namespace OpenAuth.App.ServiceApp
                         imgWidth = dimensions.width,
                         imgOriginHeight = dimensions.height,
                         imgOriginWidth = dimensions.width,
-                        psjj = lasaMediaFile.FocalLength,
+                        psjj = (double)lasaMediaFile.FocalLength,
                         time = lasaMediaFile.CreateTime,
-                        height = lasaMediaFile.Height,
+                        height = (double) lasaMediaFile.Height,
                         lon = lasaMediaFile.Lng,
                         lat = lasaMediaFile.Lat,
                         pitch = 0,

OpenAuth.Repository/Domain/DbfileInfo.cs

@@ -49,7 +49,8 @@ public class DbfineInfo
     /// <summary>
     /// 云台偏航角
     /// </summary>
-    public string hash { get; set; }
+
+    public string hashcode { get; set; }
 
     /// <summary>
     /// 拍摄相对高度

OpenAuth.Repository/Domain/LasaMediaFile.cs

@@ -126,7 +126,7 @@ public class LasaMediaFile
     public string PayloadModelName { get; set; }
     public int? Type { get; set; }
 
-    public float? FocalLength { get; set; }
+
     [SugarColumn(IsIgnore = true)] public List<LasaMediaFile> Children { get; set; }
 
     [SugarColumn(IsIgnore = true)] public string CreateUserName { get; set; }

OpenAuth.WebApi/Controllers/ServiceControllers/DroneDockController.cs

@@ -492,11 +492,11 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
 
         [HttpPost]
         [AllowAnonymous]
-        public  Response<string> UploadFile(AirPortUploadDbReq req) {
+        public  async Task<Response<string>> UploadFile(AirPortUploadDbReq req) {
             var result = new Response<string>();
             try
             {
-                result =  _app.UploadFile(req);
+                result =  await _app.UploadFile(req);
             }
             catch (Exception ex)
             {
@@ -558,7 +558,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
 
             _app.InsertDb(taskid);
             result.code = 200;
-            result.message = "error";
+            result.message = "success";
 
             return result;
 

OpenAuth.WebApi/appsettings.json

@@ -84,6 +84,6 @@
   },
   "DroneDocking": {
     "Url": "https://wp.tianmu.cloud:5443/zhcfzx",
-    "DbFile": "D://dbfile//test.db"
+    "DbFile": "E:\\Program Files (x86)\\DingDing\\DTalkFIle\\(371325)费县_20250628155400093.db"
   }
 }