修改参数
parent
dc8f03f15e
commit
03f00c9bc3
|
|
@ -39,10 +39,10 @@ namespace OpenAuth.App.ServiceApp.Algo
|
||||||
{
|
{
|
||||||
using (var db = UnitWork.CreateContext())
|
using (var db = UnitWork.CreateContext())
|
||||||
{
|
{
|
||||||
//var imageList1 = await db.LasaMediaFile.AsQueryable().Where(r => r.TaskId == firstId && r.AbsoluteAltitude != 0 && r.AbsoluteAltitude != null).OrderBy(r=>r.CreateTime).ToListAsync();
|
var imageList1 = await db.LasaMediaFile.AsQueryable().Where(r => r.TaskId == firstId && r.AbsoluteAltitude != 0 && r.AbsoluteAltitude != null).OrderBy(r=>r.CreateTime).ToListAsync();
|
||||||
//var imageList2 = await db.LasaMediaFile.AsQueryable().Where(r => r.TaskId == secondId && r.AbsoluteAltitude != 0 && r.AbsoluteAltitude != null).OrderBy(r => r.CreateTime).ToListAsync();
|
var imageList2 = await db.LasaMediaFile.AsQueryable().Where(r => r.TaskId == secondId && r.AbsoluteAltitude != 0 && r.AbsoluteAltitude != null).OrderBy(r => r.CreateTime).ToListAsync();
|
||||||
var imageList1 = await db.LasaMediaFile.AsQueryable().Where(r => r.Id == firstId && r.AbsoluteAltitude != 0 && r.AbsoluteAltitude != null).ToListAsync();
|
//var imageList1 = await db.LasaMediaFile.AsQueryable().Where(r => r.Id == firstId && r.AbsoluteAltitude != 0 && r.AbsoluteAltitude != null).ToListAsync();
|
||||||
var imageList2 = await db.LasaMediaFile.AsQueryable().Where(r => r.Id == secondId && r.AbsoluteAltitude != 0 && r.AbsoluteAltitude != null).ToListAsync();
|
//var imageList2 = await db.LasaMediaFile.AsQueryable().Where(r => r.Id == secondId && r.AbsoluteAltitude != 0 && r.AbsoluteAltitude != null).ToListAsync();
|
||||||
List<dynamic> dataList = new List<dynamic>();
|
List<dynamic> dataList = new List<dynamic>();
|
||||||
for (int i = 0; i < imageList1.Count; i++)
|
for (int i = 0; i < imageList1.Count; i++)
|
||||||
{
|
{
|
||||||
|
|
@ -118,6 +118,7 @@ namespace OpenAuth.App.ServiceApp.Algo
|
||||||
var imageList = data.imageInfoList;
|
var imageList = data.imageInfoList;
|
||||||
string detectRegionJson = JsonConvert.SerializeObject(data.info.detectRegion);
|
string detectRegionJson = JsonConvert.SerializeObject(data.info.detectRegion);
|
||||||
//string detectRegionJson = "[[0, 0],[8063, 647],[8017, 7774],[552, 8033]]";
|
//string detectRegionJson = "[[0, 0],[8063, 647],[8017, 7774],[552, 8033]]";
|
||||||
|
//string url = "http://123.132.248.154:6015/DroneEnforcement/2025/20250514/lQLPJyIVimQWGKnNA4PNA6Gw1D3q5gbxUvQIiumcIx4vAA_929_899.png";
|
||||||
var regionArray = JsonConvert.DeserializeObject<int[][]>(detectRegionJson);
|
var regionArray = JsonConvert.DeserializeObject<int[][]>(detectRegionJson);
|
||||||
if (oldinfo != null)
|
if (oldinfo != null)
|
||||||
{
|
{
|
||||||
|
|
@ -138,7 +139,7 @@ namespace OpenAuth.App.ServiceApp.Algo
|
||||||
{
|
{
|
||||||
Console.WriteLine(item.imgUrl);
|
Console.WriteLine(item.imgUrl);
|
||||||
Console.WriteLine(regionArray);
|
Console.WriteLine(regionArray);
|
||||||
var imgurlend = await DrawingImgAndUpload();
|
var imgurlend = await DrawingImgAndUpload(item.imgUrl.ToString().Replace("\\", ""), regionArray, cdid);
|
||||||
lasaAiAchievementDetail.Image = imgurlend;
|
lasaAiAchievementDetail.Image = imgurlend;
|
||||||
}
|
}
|
||||||
await db.LasaAiAchievementDetail.InsertAsync(lasaAiAchievementDetail);
|
await db.LasaAiAchievementDetail.InsertAsync(lasaAiAchievementDetail);
|
||||||
|
|
@ -174,7 +175,7 @@ namespace OpenAuth.App.ServiceApp.Algo
|
||||||
Console.WriteLine(item.imgUrl);
|
Console.WriteLine(item.imgUrl);
|
||||||
Console.WriteLine(regionArray);
|
Console.WriteLine(regionArray);
|
||||||
//var imgurlend = await DrawingImgAndUpload(item.imgUrl, regionArray);
|
//var imgurlend = await DrawingImgAndUpload(item.imgUrl, regionArray);
|
||||||
var imgurlend = await DrawingImgAndUpload();
|
var imgurlend = await DrawingImgAndUpload(item.imgUrl.ToString().Replace("\\", ""), regionArray, cdid);
|
||||||
lasaAiAchievementDetail.Image = imgurlend;
|
lasaAiAchievementDetail.Image = imgurlend;
|
||||||
}
|
}
|
||||||
lasaAiAchievement.Lat = item.latitude;
|
lasaAiAchievement.Lat = item.latitude;
|
||||||
|
|
@ -206,14 +207,14 @@ namespace OpenAuth.App.ServiceApp.Algo
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//public async Task<string> DrawingImgAndUpload(string url, int[][] regionArray)
|
//public async Task<string> DrawingImgAndUpload(string url, int[][] regionArray)
|
||||||
public async Task<string> DrawingImgAndUpload()
|
public async Task<string> DrawingImgAndUpload(string url, int[][] regionArray, string cdid)
|
||||||
{
|
{
|
||||||
string url = "http://123.132.248.154:6015/DroneEnforcement/2025/20250514/lQLPJyIVimQWGKnNA4PNA6Gw1D3q5gbxUvQIiumcIx4vAA_929_899.png";
|
//string url = "http://123.132.248.154:6015/DroneEnforcement/2025/20250514/lQLPJyIVimQWGKnNA4PNA6Gw1D3q5gbxUvQIiumcIx4vAA_929_899.png";
|
||||||
|
|
||||||
// detectRegion JSON(可以直接替换成你的接口返回数据)
|
// detectRegion JSON(可以直接替换成你的接口返回数据)
|
||||||
string detectRegionJson = "[[0, 0],[8063, 647],[8017, 7774],[552, 8033]]";
|
//string detectRegionJson = "[[0, 0],[8063, 647],[8017, 7774],[552, 8033]]";
|
||||||
var regionArray = JsonConvert.DeserializeObject<int[][]>(detectRegionJson);
|
//var regionArray = JsonConvert.DeserializeObject<int[][]>(detectRegionJson);
|
||||||
Console.WriteLine($"regionArray 是否为空");
|
//Console.WriteLine($"regionArray 是否为空");
|
||||||
|
|
||||||
//if (regionArray == null || regionArray.Length == 0)
|
//if (regionArray == null || regionArray.Length == 0)
|
||||||
// throw new ArgumentException("detectRegion 参数无效");
|
// throw new ArgumentException("detectRegion 参数无效");
|
||||||
|
|
@ -227,7 +228,6 @@ namespace OpenAuth.App.ServiceApp.Algo
|
||||||
using (HttpClient client = new HttpClient())
|
using (HttpClient client = new HttpClient())
|
||||||
{
|
{
|
||||||
var bytes = await client.GetByteArrayAsync(url);
|
var bytes = await client.GetByteArrayAsync(url);
|
||||||
|
|
||||||
using (var ms = new MemoryStream(bytes))
|
using (var ms = new MemoryStream(bytes))
|
||||||
using (var image = Image.FromStream(ms))
|
using (var image = Image.FromStream(ms))
|
||||||
using (var bmp = new Bitmap(image))
|
using (var bmp = new Bitmap(image))
|
||||||
|
|
@ -236,20 +236,19 @@ namespace OpenAuth.App.ServiceApp.Algo
|
||||||
g.SmoothingMode = SmoothingMode.AntiAlias;
|
g.SmoothingMode = SmoothingMode.AntiAlias;
|
||||||
|
|
||||||
using (var pen = new Pen(Color.Red, 5))
|
using (var pen = new Pen(Color.Red, 5))
|
||||||
using (var brush = new SolidBrush(Color.FromArgb(80, Color.Blue)))
|
|
||||||
{
|
{
|
||||||
g.FillPolygon(brush, polygon);
|
|
||||||
g.DrawPolygon(pen, polygon);
|
g.DrawPolygon(pen, polygon);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
using (var outputStream = new MemoryStream())
|
using (var outputStream = new MemoryStream())
|
||||||
{
|
{
|
||||||
bmp.Save(outputStream, ImageFormat.Png);
|
bmp.Save(outputStream, ImageFormat.Png);
|
||||||
outputStream.Position = 0;
|
outputStream.Position = 0;
|
||||||
string fileName = Path.GetFileName(new Uri(url).AbsolutePath);
|
string fileName = Path.GetFileName(new Uri(url).AbsolutePath);
|
||||||
// 上传到 MinIO(直接传 MemoryStream)
|
// 上传到 MinIO(直接传 MemoryStream)
|
||||||
string uploadedUrl = await _minioService.UploadStreamFile(outputStream, fileName, "test", Guid.NewGuid().ToString());
|
string uploadedUrl = await _minioService.UploadStreamFile(outputStream, fileName, "test", cdid);
|
||||||
Console.WriteLine(uploadedUrl);
|
Console.WriteLine("返回imgurl:" + uploadedUrl);
|
||||||
return uploadedUrl;
|
return uploadedUrl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue