HC_YFZX
/
LASAPlatform
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

feature-flyModify
陈伟 2025-09-10 16:15:47 +08:00
parent d67546072e aead344637
commit a686e3ff9e
5 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
OpenAuth.App/ServiceApp/Algo/DaHuaAiApp.cs
View File

@ -122,6 +122,7 @@ namespace OpenAuth.App.ServiceApp.Algo
var regionArray = JsonConvert.DeserializeObject<int[][]>(detectRegionJson);
if (oldinfo != null)
{
string compareGroupId = Guid.NewGuid().ToString();
int index = 0;
foreach (var item in imageList)
{
@ -133,6 +134,9 @@ namespace OpenAuth.App.ServiceApp.Algo
AiAchievementId = oldinfo.Id,
Lng = (double?)item.longitude ?? 0.0,
Lat = (double?)item.latitude ?? 0.0,
CompareIndex = index,
GroupId = compareGroupId
};
// 如果是第二张图片 -> 画区域 + 上传
if (index == 1)
@ -148,6 +152,7 @@ namespace OpenAuth.App.ServiceApp.Algo
}
else
{
string compareGroupId = Guid.NewGuid().ToString();
int index = 0;
LasaAiAchievement lasaAiAchievement = new LasaAiAchievement
{
@ -168,6 +173,8 @@ namespace OpenAuth.App.ServiceApp.Algo
AiAchievementId = lasaAiAchievement.Id,
Lng = (double?)item.longitude ?? 0.0,
Lat = (double?)item.latitude ?? 0.0,
CompareIndex = index,
GroupId = compareGroupId
};
// 如果是第二张图片 -> 画区域 + 上传
if (index == 1)
@ -334,23 +341,11 @@ namespace OpenAuth.App.ServiceApp.Algo
var modelid = modelinfo.Where(r => r.EnumValue == item.class_id).FirstOrDefault();
if (modelid != null)
{
lasaAiAchievement.Title = modelid.Name + "识别";
lasaAiAchievement.Title = modelid.Name;
}
else
{
lasaAiAchievement.Title = "其他识别";
//if (item.class_id == 1 || item.class_id == 2 || item.class_id == 3 || item.class_id == 5 || item.class_id == 6 || item.class_id == 7)
//{
// lasaAiAchievement.Title = "车辆识别";
//}
//else if (item.class_id == 0)
//{
// lasaAiAchievement.Title = "人员识别";
//}
//else
//{
// lasaAiAchievement.Title = "其他识别";
//}
lasaAiAchievement.Title = "";
}

6
OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs
View File

@ -1243,6 +1243,10 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
for (int j = 0; j < pics.Count; j++)
{
var pic = pics[j];
if (pic.ObjectKey==null||!pic.ObjectKey.EndsWith(".jpeg"))
{
continue;
}
var imageStream = _minioService.GetObjectAsStream("", pic.ObjectKey + "");
if (imageStream.Result == null)
{
@ -1274,7 +1278,7 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
// 确保所有 NOT NULL 列都有值
cmd.Parameters.AddWithValue("@BSM", pic.Id ?? "");
cmd.Parameters.AddWithValue("@DKLX", flightid.dklx ?? "");
cmd.Parameters.AddWithValue("@DKBSM", flightid.dkbh ?? "");
cmd.Parameters.AddWithValue("@DKBSM", flightid.bsm ?? "");
cmd.Parameters.AddWithValue("@ZDKBH", flightid.zdkbh ?? "");
cmd.Parameters.AddWithValue("@XZQDM", flightid.xzqdm ?? "");
cmd.Parameters.AddWithValue("@FJMC", pic.Name ?? "");

2
OpenAuth.Repository/Domain/LasaAiAchievementDetail.cs
View File

@ -17,4 +17,6 @@ public class LasaAiAchievementDetail
[SugarColumn(ColumnName = "Lat")]
public double Lat { get; set; }
public string GroupId { get; set; }
public int CompareIndex { get; set; }
}

BIN
OpenAuth.WebApi/temp/WRJ00000119.db Normal file
View File

Binary file not shown.

12
OpenAuth.WebApi/temp/WRJ00000119.sign Normal file
View File

@ -0,0 +1,12 @@
{
"attachment_count": "7",
"code": "AirportData",
"count": "0",
"extension": "db",
"hash": "83A747C4E7E4244F54B0D449811DD815FC375AFD3A5EDAA98258250CE91F4A98",
"regioncode": "370000",
"sign": "8D7440C34D89FF079DAA6FC74BFFDA5A5DE938F57A016E7639327AC0685327A90289DDA94317C3ADC64FFEA88EFF4C1FCA145629EA17FCCA6C42F5A136E817D6",
"size": "42568704",
"timestamp": "1757491062",
"version": "1"
}