1. 固定一些参数

2. 完成智能巡检结束接口
feature-flyModify
陈伟 2025-08-29 09:55:12 +08:00
parent c2f80dc8bc
commit 72323ef12a
1 changed files with 14 additions and 6 deletions

View File

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