diff --git a/OpenAuth.App/ServiceApp/ManageApp.cs b/OpenAuth.App/ServiceApp/ManageApp.cs index 9882016..81d8489 100644 --- a/OpenAuth.App/ServiceApp/ManageApp.cs +++ b/OpenAuth.App/ServiceApp/ManageApp.cs @@ -2405,19 +2405,22 @@ namespace OpenAuth.App.ServiceApp .Where(x => x.Id == req.AlgoInstanceId) .ToListAsync(); var tagsIds = algoInstances.Select(x => x.Tags).ToList(); + var algoIds = algoInstances.First().AlgoIds.Split(",").ToArray(); var algo = await db .Queryable() - .Where(x => x.Id == algoInstances.First().AlgoIds) + .Where(x => x.Id == algoIds[0]) .FirstAsync(); dynamic json = new ExpandoObject(); var x = SnowFlakeSingle.instance; - var pushUrl = $"rtmp://box.wisestcity.com:1935/live/{x.NextId()}"; + //var pushUrl = $"rtmp://box.wisestcity.com:1935/live/{x.NextId()}"; + var pushUrl = "rtmp://box.wisestcity.com:1935/live/8"; json.rtmp_url = req.RtmpUrl; json.push_url = pushUrl; json.imgsz = 640; json.frame_skip = 1; - json.model_name = algo.Path; + //json.model_name = algo.Path; + json.model_name = "yolov8x.pt"; json.taskname = task.TaskName; json.taskid = req.TaskId; var taskRecord = new LasaTask() @@ -2432,8 +2435,8 @@ namespace OpenAuth.App.ServiceApp .Where(x => tagsIds.Contains(x.Id)) .Select(x => x.EnumValue) .ToArrayAsync(); - json.tag = tag; - var content = new StringContent(json, Encoding.UTF8, "application/json"); + json.tag = new int [0, 1, 2, 3, 4, 5]; + var content = new StringContent(JsonConvert.SerializeObject(json), Encoding.UTF8, "application/json"); using var httpClient = new HttpClient(); var response = await httpClient.PostAsync("http://192.168.10.131:9025/start_detection", content); db.Ado.CommitTran(); @@ -2441,7 +2444,8 @@ namespace OpenAuth.App.ServiceApp catch (Exception ex) { db.Ado.RollbackTran(); - throw new Exception("调用智能巡检失败"); + throw ex; + //throw new Exception("调用智能巡检失败"); } return new Response() @@ -2462,6 +2466,10 @@ namespace OpenAuth.App.ServiceApp { db.Ado.BeginTran(); await db.Updateable(task).IgnoreNullColumns().ExecuteCommandAsync(); + // 结束智能巡检 + using var httpClient = new HttpClient(); + await httpClient.PostAsync("http://192.168.10.131:9025/stop_detection", null); + //var response = await httpClient.PostAsync("http://192.168.10.131:9025/stop_detection"); db.Ado.CommitTran(); } catch (Exception ex)