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

OpenAuth.App/ServiceApp/AI/AiAchievementServiceApp.cs

@@ -21,6 +21,7 @@ public class AiAchievementServiceApp : SqlSugarBaseApp<LasaAiAchievement, SugarD
         var page = await Repository.AsQueryable()
             .WhereIF(!string.IsNullOrEmpty(req.key), x => x.Title.Contains(req.key))
             .WhereIF(req.startTime != null, x => x.CreateTime >= req.startTime && x.CreateTime <= req.endTime)
+            .Where(x => x.AiModel != "DaHuaAi")
             .OrderByDescending(x => x.CreateTime)
             .ToPageListAsync(req.page, req.limit, total);
         return new Response<PageInfo<List<LasaAiAchievement>>>()

OpenAuth.App/ServiceApp/Algo/DaHuaAiApp.cs

@@ -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 = "";
                         }
 
 

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -2379,7 +2379,7 @@ namespace OpenAuth.App.ServiceApp
                 TaskType = 0,
                 //0 计划任务 1 手飞任务
                 FlightTaskType = 1,
-                AIInspection = "true",
+                AIInspection = "false",
                 WorkspaceId = task.WorkspaceId,
                 FlightId = task.FlightId,
                 Status = 1, // 待执行
@@ -2405,7 +2405,6 @@ namespace OpenAuth.App.ServiceApp
             var task = await Repository
                 .ChangeRepository<SugarRepositiry<LasaTask>>()
                 .GetByIdAsync(req.TaskId);
-            ;
             using var db = Repository.AsSugarClient();
             try
             {
@@ -2476,7 +2475,8 @@ namespace OpenAuth.App.ServiceApp
                 {
                     Id = req.TaskId,
                     Status = 6, // 智能巡检状态
-                    PushUrl = pushUrl
+                    PushUrl = pushUrl,
+                    AIInspection = "true",
                 };
                 var tagIdArray = new List<string>();
                 foreach (var tagId in tagsIds)
@@ -2721,7 +2721,9 @@ namespace OpenAuth.App.ServiceApp
         public async Task<Response<bool>> EndAiInspection(string taskid)
         {
             var taskTemp = await Repository.ChangeRepository<SugarRepositiry<LasaTask>>()
-                .GetByIdAsync(taskid);
+                .AsQueryable()
+                .Where(r => r.AIInspection == "false")
+                .FirstAsync();
             if (taskTemp == null)
             {
                 return new Response<bool>()

OpenAuth.App/ServiceApp/Subscribe/ConfigSubscribe.cs

@@ -780,7 +780,7 @@ public class ConfigSubscribe : IJob
                                 var taskAssignRecord = new LasaTaskAssign()
                                 {
                                     Id = taskAssign.Id,
-                                    Reason = errorMsg,
+                                    Reason = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss} {errorMsg}（错误码： {code}）",
                                     Status = 2
                                 };
                                 _sqlSugarClient.Updateable(taskAssignRecord).IgnoreNullColumns().ExecuteCommand();
@@ -788,7 +788,7 @@ public class ConfigSubscribe : IJob
                                 {
                                     Id = taskAssign.TaskId,
                                     Status = 2, // todo 状态待定
-                                    Reason = errorMsg //失败原因
+                                    Reason = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss} {errorMsg}（错误码： {code}）"
                                 };
                                 _sqlSugarClient.Updateable(taskUpdate).IgnoreNullColumns().ExecuteCommand();
                             }

OpenAuth.Repository/Domain/LasaAiAchievementDetail.cs

@@ -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; } 
 }