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

Compare commits

base: HC_YFZX:cb0008e09dea35874e1e7486d2aeec55f682e4e1
Branches Tags
HC_YFZX:feature-flyModify
HC_YFZX:main
...
compare: HC_YFZX:45532b78e82c844ebb2eee0c3fb735c48c27245b
Branches Tags
HC_YFZX:feature-flyModify
HC_YFZX:main

2 Commits
cb0008e09d ... 45532b78e8

Author SHA1 Message Date
陈伟 45532b78e8 算法调用改动重新提交 2025-12-17 10:59:56 +08:00
陈伟 a811ec3566 复原算法调用 2025-12-17 10:59:31 +08:00
1 changed files with 2 additions and 147 deletions
Show Stats Expand all files Collapse all files

149
OpenAuth.App/ServiceApp/ManageApp.cs
View File

@ -2533,153 +2533,6 @@ namespace OpenAuth.App.ServiceApp
}; };
} }
public async Task<Response<bool>> CallAiModelOld(CallAiModel req)
{
_logger.LogDebug("成功调用CallAIModel");
var task = await Repository
.ChangeRepository<SugarRepositiry<LasaTask>>()
.GetByIdAsync(req.TaskId);
using var db = Repository.AsSugarClient();
try
{
db.Ado.BeginTran();
if (task.FlightTaskType.Equals(1)) // 手飞任务
{
var aiInspection = new LasaAiInspection
{
Id = Guid.NewGuid().ToString(),
TaskId = req.TaskId,
AlgoInstanceId = req.AlgoInstanceId,
};
if (!string.IsNullOrEmpty(req.WarningContent))
{
aiInspection.WarningTitle = req.WarningTitle;
}
if (!string.IsNullOrEmpty(req.WarningContent))
{
aiInspection.WarningContent = req.WarningContent;
}
// 关于多次调用问题
var count = await db.Queryable<LasaAiInspection>().Where(x => x.TaskId == req.TaskId).CountAsync();
if (count == 0)
{
// 设置任务智能巡检标识
task.AIInspection = "true";
task.Status = 3; // 表示智能巡检中
await db.Updateable(task).ExecuteCommandAsync();
await db.Insertable(aiInspection).ExecuteCommandAsync();
}
}
else
{
// 计划任务
var aiInspection = await Repository
.ChangeRepository<SugarRepositiry<LasaAiInspection>>()
.AsQueryable().Where(x => x.TaskId == req.TaskId).FirstAsync();
req.AlgoInstanceId = aiInspection.AlgoInstanceId;
}
var algoInstances = await db
.Queryable<LasaAlgoInstance>()
.Where(x => x.Id == req.AlgoInstanceId)
.ToListAsync();
var tagsIds = algoInstances.Select(x => x.Tags).ToList();
// todo 关于存在多个算法的处理
var algoIds = algoInstances.First().AlgoIds.Split(",").ToArray();
var algo = await db
.Queryable<LasaAlgorithmsRepository>()
.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 config = ConfigHelper.GetConfigRoot();
var pushUrl = config["AIModelApi:PushUrl"];
// 取得无人机sn + 1
if (string.IsNullOrEmpty(req.UavSn))
{
var lasaDronePort = await Repository.AsSugarClient().Queryable<LasaDronePort>()
.LeftJoin<LasaUav>((a, b) => a.Id == b.PId)
.Where((a, b) => a.Id == task.TaskDronePort).Select<dynamic>(
(a, b) => new
{
UavSn = b.Sn,
b.TypeId
}
).FirstAsync();
pushUrl += lasaDronePort.UavSn + "1";
}
else
{
pushUrl += req.UavSn + 1;
}
json.rtmp_url = req.RtmpUrl; // 无人机直播流
json.push_url = pushUrl; // 识别结果推流
json.imgsz = 640;
json.frame_skip = 1;
json.model_name = algo.Path;
//json.model_name = "yolo12x.pt";
json.taskname = task.TaskName;
json.taskid = req.TaskId;
// 算法id
json.AlgoId = algo.Id;
var taskRecord = new LasaTask()
{
Id = req.TaskId,
Status = 6, // 智能巡检状态
PushUrl = pushUrl,
AIInspection = "true",
};
var tagIdArray = new List<string>();
foreach (var tagId in tagsIds)
{
tagIdArray.AddRange(tagId.Split(",").ToList());
}
await db.Updateable(taskRecord).IgnoreNullColumns().ExecuteCommandAsync();
var tag = await db
.Queryable<LasaModelLabel>()
.Where(l => tagIdArray.Contains(l.Id))
.ToArrayAsync();
IDictionary<string, object> jsonTag = new Dictionary<string, object>();
foreach (var lasaModelLabel in tag)
{
var model = new
{
name = lasaModelLabel.Name,
reliability = lasaModelLabel.Reliability
};
jsonTag[lasaModelLabel.EnumValue.ToString()] = model;
}
json.tag = jsonTag;
_logger.LogDebug($"发送的json:{JsonConvert.SerializeObject(json)}");
var content = new StringContent(JsonConvert.SerializeObject(json), Encoding.UTF8, "application/json");
var url = config["AIModelApi:Url"];
using var httpClient = new HttpClient();
var response = await httpClient.PostAsync($"{url}/start_detection", content);
//var response = await httpClient.PostAsync("http://192.168.10.131:9025/start_detection", content);
_logger.LogDebug($"成功调用{response.IsSuccessStatusCode}");
db.Ado.CommitTran();
}
catch (Exception ex)
{
db.Ado.RollbackTran();
throw ex;
//throw new Exception("调用智能巡检失败");
}
return new Response<bool>()
{
Result = true
};
}
public async Task<Response<bool>> CallAiModel(CallAiModel req) public async Task<Response<bool>> CallAiModel(CallAiModel req)
{ {
_logger.LogDebug("成功调用CallAIModel"); _logger.LogDebug("成功调用CallAIModel");
@ -2853,6 +2706,8 @@ namespace OpenAuth.App.ServiceApp
}; };
} }
public async Task<Response<dynamic>> EndHandFlyTask(string taskid) public async Task<Response<dynamic>> EndHandFlyTask(string taskid)
{ {
var savedTask = await Repository.ChangeRepository<SugarRepositiry<LasaTask>>().AsQueryable() var savedTask = await Repository.ChangeRepository<SugarRepositiry<LasaTask>>().AsQueryable()