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

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	OpenAuth.App/ServiceApp/ManageApp.cs
main
陈伟 2 months ago
parent 0a5579d4b9 602b417dc8
commit 5088724d8f
25 changed files with 1659 additions and 235 deletions
Show Stats Download Patch File Download Diff File

35
Infrastructure/Helpers/EncryptionHelper.cs
Unescape Escape View File

@ -5,6 +5,7 @@ using System.Buffers.Text;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reactive;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Text.Unicode;
@ -16,6 +17,7 @@ namespace Infrastructure.Helpers
{
String privateKey = "ABA4354EFAFE944C2F226A3981C7DC70F43BD6053EDA83F4DC274242BBB23CAA";
String publicKey = "04F1BF1BEFD63F16E5DB3BCD32CA5D9A8E8DF7ADD67D6C4F293FB23F7BDA74F52D31B8DDAD03D955D566505A15D8B7DBE83B42378B8E8749C0EB6E2FBC8675838B";
string publickey = "04D6974E2384ECE39F5ADF1473E4B9B60E0D438A6F701F667C0C88D25BE2F8508A3AAFF9D9500ECFFD8E79B2DE58C024B689B5C207486646EA08A352FBB0016D46";
byte[] sm4Key = null;
public EncryptionHelper()
{
@ -31,8 +33,8 @@ namespace Infrastructure.Helpers
{
sm4Key = SM4CryptoHelper.GenerateSM4Key();
}
string publickey = "04D6974E2384ECE39F5ADF1473E4B9B60E0D438A6F701F667C0C88D25BE2F8508A3AAFF9D9500ECFFD8E79B2DE58C024B689B5C207486646EA08A352FBB0016D46";
//十六进制字符串 → 字节数组
//十六进制字符串 → 字节数组 publickey
byte[] publickeybyte = HexToBytes(publickey);
var encryptdatasm2 = SM2CryptoHelper.Encrypt(publickeybyte, sm4Key);
return Convert.ToBase64String(encryptdatasm2);
@ -95,9 +97,6 @@ namespace Infrastructure.Helpers
{
throw new InvalidOperationException("SM2签名失败", ex);
}
// SM2 签名
//byte[] signData = SM2CryptoHelper.Sign(privatekeybyte, needSignDataByte);
// Base64 编码签名（直接使用 Convert）
string signDataBase64 = Convert.ToBase64String(signData);
@ -108,6 +107,32 @@ namespace Infrastructure.Helpers
return token;
}
public bool Verify(string str)
{
string signData = "";
// 拼接待签名数据
string needSignData = "";
if (!string.IsNullOrEmpty(str))
{
string[] tokenstr = str.Split(".");
signData=tokenstr[2];
needSignData = tokenstr[0] + tokenstr[1];
}
byte[] signbyte=Convert.FromBase64String(signData);
byte[] needSignDataByte = Encoding.UTF8.GetBytes(needSignData);
// 4. SM2验签 publickey
byte[] publickeybyte = HexToBytes(publickey);
try
{
return SM2CryptoHelper.Verify(publickeybyte, needSignDataByte, signbyte);
}
catch (Exception ex)
{
throw new InvalidOperationException("SM2签名失败", ex);
}
}
/// <summary>
/// 内部转byte方法
/// </summary>

2
OpenAuth.App/BaseApp/Subscribe/ConfigSubscribe.cs
Unescape Escape View File

@ -287,7 +287,7 @@ public class ConfigSubscribe : IJob
{
if (!method.Equals("hms"))
{
Console.WriteLine($"未处理事件events：{message}");
//Console.WriteLine($"未处理事件events：{message}");
}
break;

8
OpenAuth.App/BaseApp/UserManager/UserManagerApp.cs
Unescape Escape View File

@ -512,17 +512,17 @@ namespace OpenAuth.App
{
using (var uow = base.UnitWork.CreateContext())
{
foreach (var item in uow.Db.DbMaintenance.GetTableInfoList().Where(r => r.Name.ToLower().StartsWith("lasa_shpdata")))
foreach (var item in uow.Db.DbMaintenance.GetTableInfoList().Where(r => r.Name.ToLower().StartsWith("drone_docktask")))
{
//string entityName = item.Name.Substring(0, 1).ToUpper() + item.Name.Substring(1, 7).ToLower() + item.Name.Substring(9, 1).ToUpper() + item.Name.Substring(10).ToLower();/*实体名大写*/
string entityName = "LasaShpData";
string entityName = item.Name.Substring(0, 1).ToUpper() + item.Name.Substring(1, 4).ToLower() + item.Name.Substring(6, 1).ToUpper() + item.Name.Substring(7).ToLower();/*实体名大写*/
//string entityName = "LasaShpData";
uow.Db.MappingTables.Add(entityName, item.Name);
//foreach (var col in db.DbMaintenance.GetColumnInfosByTableName(item.Name))
//{
// db.MappingColumns.Add(col.DbColumnName.ToUpper() /*类的属性大写*/, col.DbColumnName, entityName);
//}
}
uow.Db.DbFirst.Where(r => r.ToLower().StartsWith("lasa_shpdata")).IsCreateAttribute().CreateClassFile("E:\\低空态势感知\\code\\OpenAuth.Repository\\Domain", "OpenAuth.Repository.Domain");
uow.Db.DbFirst.Where(r => r.ToLower().StartsWith("drone_docktask")).IsCreateAttribute().CreateClassFile("E:\\低空态势感知\\code\\OpenAuth.Repository\\Domain", "OpenAuth.Repository.Domain");
uow.Commit();
}
return "更新实体成功";

43
OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs
Unescape Escape View File

@ -180,6 +180,23 @@ namespace OpenAuth.App.ServiceApp
}
}
}
public async Task<List<string>> GetUavSn()
{
using (var db = UnitWork.CreateContext())
{
var uavinfo = await db.LasaUav.AsQueryable().Where(r => r.IsDelete == false).Select(r => r.Sn).ToListAsync();
var dockinfo = await db.LasaDronePort.AsQueryable().Where(r => r.IsDelete == false).Select(r => r.Sn).ToListAsync();
if (dockinfo != null)
{
return dockinfo.Union(uavinfo).ToList();
}
else
{
return new List<string>();
}
}
}
#region 固件版本管理
public async Task<Response<bool>> AddFirmware(LasaFirmware info)
@ -279,6 +296,32 @@ namespace OpenAuth.App.ServiceApp
return false;
}
}
/// <summary>
/// 获取日志
/// </summary>
/// <param name="sn"></param>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <param name="page"></param>
/// <param name="limit"></param>
/// <returns></returns>
public async Task<Response<PageInfo<List<LasaLog>>>> GetLogList(string sn, DateTime startTime, DateTime endTime, int page, int limit)
{
RefAsync<int> totalCount = 0;
using (var db = UnitWork.CreateContext())
{
var topic = $"thing/product/{sn}/osd";
var list = await db.LasaLog.AsQueryable()
.Where(x => x.CreateTime >= startTime && x.CreateTime <= endTime)
.Where(x => x.Topic == topic)
.OrderBy(x => x.CreateTime, OrderByType.Asc)
.ToPageListAsync(page, limit, totalCount);
return new Response<PageInfo<List<LasaLog>>>
{
Result = new PageInfo<List<LasaLog>> { Items = list, Total = totalCount }
};
}
}
#endregion
}
}

637
OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs
Unescape Escape View File

@ -0,0 +1,637 @@
using OpenAuth.App.BaseApp.Base;
using OpenAuth.Repository.Domain;
using OpenAuth.Repository;
using System.Text;
using OpenAuth.App.Interface;
using SqlSugar;
using Infrastructure;
using Infrastructure.Helpers;
using System.Text.Json;
using OpenAuth.App.ServiceApp.Response;
using Microsoft.Extensions.Configuration;
using OpenAuth.App.ServiceApp.DroneDocking.Request;
using DocumentFormat.OpenXml.Office.CustomUI;
namespace OpenAuth.App.ServiceApp.DroneDocking
{
public class DroneDockApp : SqlSugarBaseApp<DroneDocktask, SugarDbContext>
{
private EncryptionHelper _helper;
private IConfiguration configuration;
public DroneDockApp(EncryptionHelper helper, IConfiguration configuration, ISugarUnitOfWork<SugarDbContext> unitWork, ISimpleClient<DroneDocktask> repository, IAuth auth) : base(unitWork, repository, auth)
{
_helper = helper;
this.configuration = configuration;
}
/// <summary>
/// 无人机机场接口注册更新
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
public async Task<Response<string>> RegistService(AirPortRegistReq req )
{
Response<string> Response = new Response<string>();
var handler = new HttpClientHandler();
// 如果需要忽略服务器证书错误（仅测试环境）
handler.ServerCertificateCustomValidationCallback = (sender, cert, chain, sslPolicyErrors) => true;
using (var client = new HttpClient())
{
try
{
string url = configuration.GetSection("DroneDocking:Url").Value + "/droneAirport/RegistService";
string x_lc_secret = _helper.getxseret();
string centercode = "UAV32_LJY2FPMYDE6UDES3P3ZD7V3IKQ";
string x_token = _helper.GetToken(centercode);
// 序列化为 JSON 字符串
string json = JsonSerializer.Serialize(req);
// 转换为字节数组
byte[] bytes = Encoding.UTF8.GetBytes(json);
var encryptedData = _helper.Encrypt(bytes);
// 创建请求体
var httpContent = new StringContent(encryptedData, Encoding.UTF8, "application/json");
// 添加请求头
client.DefaultRequestHeaders.Add("x-lc-secret", x_lc_secret);
client.DefaultRequestHeaders.Add("x-lc-token", x_token);
//发送请求
HttpResponseMessage response = await client.PostAsync(url, httpContent);
response.EnsureSuccessStatusCode();
// 获取响应头中的 x_cl_screte 参数
string resx_cl_screte = GetHeaderValue(response, "x-lc-secret");
// 读取响应内容并反序列化
string responseBody = await response.Content.ReadAsStringAsync();
var result = JsonSerializer.Deserialize<ReciveData<string>>(responseBody);
//解密数据
byte[] resbytesx = Convert.FromBase64String(resx_cl_screte);
byte[] resdatabytes = Convert.FromBase64String(result?.data);
string data = _helper.Decrypt(resbytesx, resdatabytes);
Response.Result = data;
Response.Message = result.message;
Response.Code = result.code;
}
catch (HttpRequestException e)
{
Console.WriteLine("\nException Caught!");
Console.WriteLine("Message :{0} ", e.Message);
Response.Result = "连接错误";
}
}
return Response;
}
/// <summary>
/// 无人机机场设备注册/更新
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
public async Task<Response<string>> AddDevice(AddDeviceReq req)
{
Response<string> Response = new Response<string>();
var handler = new HttpClientHandler();
// 如果需要忽略服务器证书错误（仅测试环境）
handler.ServerCertificateCustomValidationCallback = (sender, cert, chain, sslPolicyErrors) => true;
using (var client = new HttpClient())
{
try
{
string url = configuration.GetSection("DroneDocking:Url").Value+ "/droneAirport/addDevice";
string x_lc_secret = _helper.getxseret();
string centercode = "UAV32_LJY2FPMYDE6UDES3P3ZD7V3IKQ";
string x_token = _helper.GetToken(centercode);
// 序列化为 JSON 字符串
string json = JsonSerializer.Serialize(req);
// 转换为字节数组
byte[] bytes = Encoding.UTF8.GetBytes(json);
var encryptedData = _helper.Encrypt(bytes);
// 创建请求体
var httpContent = new StringContent(encryptedData, Encoding.UTF8, "application/json");
// 添加请求头
client.DefaultRequestHeaders.Add("x-lc-secret", x_lc_secret);
client.DefaultRequestHeaders.Add("x-lc-token", x_token);
//发送请求
HttpResponseMessage response = await client.PostAsync(url, httpContent);
response.EnsureSuccessStatusCode();
// 获取响应头中的 x_cl_screte 参数
string resx_cl_screte = GetHeaderValue(response, "x-lc-secret");
// 读取响应内容并反序列化
string responseBody = await response.Content.ReadAsStringAsync();
var result = JsonSerializer.Deserialize<ReciveData<string>>(responseBody);
//解密数据
byte[] resbytesx = Convert.FromBase64String(resx_cl_screte);
byte[] resdatabytes = Convert.FromBase64String(result?.data);
string data = _helper.Decrypt(resbytesx, resdatabytes);
Response.Result = data;
Response.Message = result.message;
Response.Code = result.code;
}
catch (HttpRequestException e)
{
Console.WriteLine("\nException Caught!");
Console.WriteLine("Message :{0} ", e.Message);
Response.Result = "连接错误";
}
}
return Response;
}
/// <summary>
/// 无人机机场授权
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
public async Task<Response<string>> Authorization(AuthorizationReq req)
{
Response<string> Response = new Response<string>();
var handler = new HttpClientHandler();
// 如果需要忽略服务器证书错误（仅测试环境）
handler.ServerCertificateCustomValidationCallback = (sender, cert, chain, sslPolicyErrors) => true;
using (var client = new HttpClient())
{
try
{
string url = configuration.GetSection("DroneDocking:Url").Value + "/droneAirport/authorization";
string x_lc_secret = _helper.getxseret();
string centercode = "UAV32_LJY2FPMYDE6UDES3P3ZD7V3IKQ";
string x_token = _helper.GetToken(centercode);
// 序列化为 JSON 字符串
string json = JsonSerializer.Serialize(req);
// 转换为字节数组
byte[] bytes = Encoding.UTF8.GetBytes(json);
var encryptedData = _helper.Encrypt(bytes);
// 创建请求体
var httpContent = new StringContent(encryptedData, Encoding.UTF8, "application/json");
// 添加请求头
client.DefaultRequestHeaders.Add("x-lc-secret", x_lc_secret);
client.DefaultRequestHeaders.Add("x-lc-token", x_token);
//发送请求
HttpResponseMessage response = await client.PostAsync(url, httpContent);
response.EnsureSuccessStatusCode();
// 获取响应头中的 x_cl_screte 参数
string resx_cl_screte = GetHeaderValue(response, "x-lc-secret");
// 读取响应内容并反序列化
string responseBody = await response.Content.ReadAsStringAsync();
var result = JsonSerializer.Deserialize<ReciveData<string>>(responseBody);
//解密数据
byte[] resbytesx = Convert.FromBase64String(resx_cl_screte);
byte[] resdatabytes = Convert.FromBase64String(result?.data);
string data = _helper.Decrypt(resbytesx, resdatabytes);
Response.Result = data;
Response.Message = result.message;
Response.Code = result.code;
}
catch (HttpRequestException e)
{
Console.WriteLine("\nException Caught!");
Console.WriteLine("Message :{0} ", e.Message);
Response.Result = "连接错误";
}
}
return Response;
}
/// <summary>
/// 无人机机场授权
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
public async Task<Response<string>> Test(AirPortUpdateTaskReq req)
{
Response<string> Response = new Response<string>();
var handler = new HttpClientHandler();
// 如果需要忽略服务器证书错误（仅测试环境）
handler.ServerCertificateCustomValidationCallback = (sender, cert, chain, sslPolicyErrors) => true;
using (var client = new HttpClient())
{
try
{
string url = "http://localhost:10042/zhcfzx/droneAirport/updateTask";
string x_lc_secret = _helper.getxseret();
string centercode = "UAV32_LJY2FPMYDE6UDES3P3ZD7V3IKQ";
string x_token = "API32_HENJOZMPBYKEXNVLFMY3Y5W5SQ.1751622229582.fmCjIucQYyq4YZe4CnSStN/rHcwjZTxUsDuXeXJfrYn0bwoaV1/IW8mcFwtLw8JHjowvMJrmPyy/QZAhssxQCQ==";
// 序列化为 JSON 字符串
string json = JsonSerializer.Serialize(req);
// 转换为字节数组
byte[] bytes = Encoding.UTF8.GetBytes(json);
var encryptedData = _helper.Encrypt(bytes);
// 创建请求体
var httpContent = new StringContent(encryptedData, Encoding.UTF8, "application/json");
// 添加请求头
client.DefaultRequestHeaders.Add("x-lc-secret", x_lc_secret);
client.DefaultRequestHeaders.Add("x-lc-token", x_token);
//发送请求
HttpResponseMessage response = await client.PostAsync(url, httpContent);
response.EnsureSuccessStatusCode();
// 获取响应头中的 x_cl_screte 参数
string resx_cl_screte = GetHeaderValue(response, "x-lc-secret");
// 读取响应内容并反序列化
string responseBody = await response.Content.ReadAsStringAsync();
var result = JsonSerializer.Deserialize<ReciveData<string>>(responseBody);
//解密数据
byte[] resbytesx = Convert.FromBase64String(resx_cl_screte);
byte[] resdatabytes = Convert.FromBase64String(result?.data);
string data = _helper.Decrypt(resbytesx, resdatabytes);
Response.Result = data;
Response.Message = result.message;
Response.Code = result.code;
}
catch (HttpRequestException e)
{
Console.WriteLine("\nException Caught!");
Console.WriteLine("Message :{0} ", e.Message);
Response.Result = "连接错误";
}
}
return Response;
}
public async Task<Response<string>> Test1(string taskid)
{
Response<string> Response = new Response<string>();
var handler = new HttpClientHandler();
// 如果需要忽略服务器证书错误（仅测试环境）
handler.ServerCertificateCustomValidationCallback = (sender, cert, chain, sslPolicyErrors) => true;
using (var client = new HttpClient())
{
try
{
string url = $"http://localhost:10042/zhcfzx/droneAirport/cancelTask?taskid={taskid}";
//string x_lc_secret = _helper.getxseret();
string centercode = "UAV32_LJY2FPMYDE6UDES3P3ZD7V3IKQ";
string x_token = "API32_HENJOZMPBYKEXNVLFMY3Y5W5SQ.1751622229582.fmCjIucQYyq4YZe4CnSStN/rHcwjZTxUsDuXeXJfrYn0bwoaV1/IW8mcFwtLw8JHjowvMJrmPyy/QZAhssxQCQ==";
// 添加请求头
client.DefaultRequestHeaders.Add("x-lc-token", x_token);
//发送请求
HttpResponseMessage response = await client.GetAsync(url);
response.EnsureSuccessStatusCode();
// 获取响应头中的 x_cl_screte 参数
string resx_cl_screte = GetHeaderValue(response, "x-lc-secret");
// 读取响应内容并反序列化
string responseBody = await response.Content.ReadAsStringAsync();
var result = JsonSerializer.Deserialize<ReciveData<string>>(responseBody);
//解密数据
byte[] resbytesx = Convert.FromBase64String(resx_cl_screte);
byte[] resdatabytes = Convert.FromBase64String(result?.data);
string data = _helper.Decrypt(resbytesx, resdatabytes);
Response.Result = data;
Response.Message = result.message;
Response.Code = result.code;
}
catch (HttpRequestException e)
{
Console.WriteLine("\nException Caught!");
Console.WriteLine("Message :{0} ", e.Message);
Response.Result = "连接错误";
}
}
return Response;
}
/// <summary>
/// 无人机任务添加
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
public async Task<ResData> AddTask(string req,string secret)
{
ResData Response = new ResData();
//解密数据
byte[] secretbyte = Convert.FromBase64String(secret); //x-lc-secret
byte[] reqbyte = Convert.FromBase64String(req); //返回数据
string data = _helper.Decrypt(secretbyte, reqbyte);
//序列化返回数据并处理
var task = JsonSerializer.Deserialize<AirPortTaskReq>(data);
//task数据生成
DroneDocktask dt= new DroneDocktask();
dt.id=Guid.NewGuid().ToString();
dt.deviceid=task.deviceid.ToString();
dt.bizidname=task.bizidname.ToString();
dt.taskid = task.taskid;
dt.taskname = task.taskname;
dt.datacode= task.datacode;
dt.state = 0;
dt.createtime = DateTime.Now;
//taskdetail数据生成
List<DroneDocktaskdetail> dalist= new List<DroneDocktaskdetail>();
if (task.tasklist.Count > 0 )
{
foreach(var item in task.tasklist)
{
DroneDocktaskdetail da= new DroneDocktaskdetail();
da.id = Guid.NewGuid().ToString();
da.taskid = dt.id;
da.bz=item.bz;
da.dkbh=item.dkbh;
da.dkfw=item.dkfw;
da.dkmj=item.dkmj;
da.dkmc=item.dkmc;
da.xzqdm=item.xzqdm;
da.zdkbh=item.zdkbh;
da.bsm=item.bsm;
da.dklx=item.dklx;
dalist.Add(da);
}
}
using (var uow = base.UnitWork.CreateContext())
{
//查询数据 检查是否有重复数据
var info = uow.DroneDocktask.AsQueryable().Where(r => r.taskid == task.taskid).First();
if (info != null)
{
//本地数据库数据添加
await uow.DroneDocktask.InsertAsync(dt);
await uow.DroneDocktaskdetail.InsertRangeAsync(dalist);
var flag = uow.Commit();
//返回数据
if (flag)
{
string x_lc_secret = _helper.getxseret();
// 转换为字节数组
byte[] bytes = Encoding.UTF8.GetBytes(dt.taskid);
var encryptedResData = _helper.Encrypt(bytes);
Response.Result = encryptedResData;
Response.Message = "无人机机场任务添加成功";
Response.Code = 200;
Response.Secret = x_lc_secret;
return Response;
}
else
{
string x_lc_secret = _helper.getxseret();
// 转换为字节数组
byte[] bytes = Encoding.UTF8.GetBytes(" ");
var encryptedResData = _helper.Encrypt(bytes);
Response.Result = encryptedResData;
Response.Message = "无人机机场任务添加失败";
Response.Code = 500;
Response.Secret = x_lc_secret;
return Response;
}
}
else
{
string x_lc_secret = _helper.getxseret();
// 转换为字节数组
byte[] bytes = Encoding.UTF8.GetBytes(" ");
var encryptedResData = _helper.Encrypt(bytes);
Response.Result = encryptedResData;
Response.Message = "已存在相同taskid任务";
Response.Code = 500;
Response.Secret = x_lc_secret;
return Response;
}
}
}
/// <summary>
/// 无人机任务更新
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
public async Task<ResData> UpdateTask(string req, string secret)
{
ResData Response = new ResData();
//解密数据
byte[] secretbyte = Convert.FromBase64String(secret); //x-lc-secret
byte[] reqbyte = Convert.FromBase64String(req); //返回数据
string data = _helper.Decrypt(secretbyte, reqbyte);
//序列化返回数据并处理
var task = JsonSerializer.Deserialize<AirPortUpdateTaskReq>(data);
using (var uow = base.UnitWork.CreateContext())
{
//查询数据
var info=uow.DroneDocktask.AsQueryable().Where(r=>r.taskid==task.taskid).First();
if (info != null)
{
if (info.state == 0)
{
//taskdetail数据生成
List<DroneDocktaskdetail> dalist = new List<DroneDocktaskdetail>();
if (task.tasklist.Count > 0)
{
foreach (var item in task.tasklist)
{
DroneDocktaskdetail da = new DroneDocktaskdetail();
da.id = Guid.NewGuid().ToString();
da.taskid = info.id;
da.bz = item.bz;
da.dkbh = item.dkbh;
da.dkfw = item.dkfw;
da.dkmj = item.dkmj;
da.dkmc = item.dkmc;
da.xzqdm = item.xzqdm;
da.zdkbh = item.zdkbh;
da.bsm = item.bsm;
da.dklx = item.dklx;
dalist.Add(da);
}
}
await uow.DroneDocktaskdetail.DeleteAsync(r => r.taskid == info.taskid);
await uow.DroneDocktaskdetail.InsertRangeAsync(dalist);
var flag = uow.Commit();
//返回数据
if (flag)
{
string x_lc_secret = _helper.getxseret();
// 转换为字节数组
byte[] bytes = Encoding.UTF8.GetBytes(info.taskid);
var encryptedResData = _helper.Encrypt(bytes);
Response.Result = encryptedResData;
Response.Message = "无人机机场任务更新成功";
Response.Code = 200;
Response.Secret = x_lc_secret;
return Response;
}
else
{
string x_lc_secret = _helper.getxseret();
// 转换为字节数组
byte[] bytes = Encoding.UTF8.GetBytes(" ");
var encryptedResData = _helper.Encrypt(bytes);
Response.Result = encryptedResData;
Response.Message = "无人机机场任务更新失败";
Response.Code = 500;
Response.Secret = x_lc_secret;
return Response;
}
}
else
{
string x_lc_secret = _helper.getxseret();
// 转换为字节数组
byte[] bytes = Encoding.UTF8.GetBytes(" ");
var encryptedResData = _helper.Encrypt(bytes);
Response.Result = encryptedResData;
Response.Message = "任务已开始执行，无法更新，请重新添加任务";
Response.Code = 500;
Response.Secret = x_lc_secret;
return Response;
}
}
else
{
string x_lc_secret = _helper.getxseret();
// 转换为字节数组
byte[] bytes = Encoding.UTF8.GetBytes(" ");
var encryptedResData = _helper.Encrypt(bytes);
Response.Result = encryptedResData;
Response.Message = "未找到任务数据";
Response.Code = 500;
Response.Secret = x_lc_secret;
return Response;
}
}
}
/// <summary>
/// 取消任务
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
public async Task<ResData> CancelTask(string taskid)
{
ResData Response = new ResData();
using (var uow = base.UnitWork.CreateContext())
{
//查询数据
var info = uow.DroneDocktask.AsQueryable().Where(r => r.taskid == taskid).First();
if (info != null)
{
var flag = await uow.DroneDocktask.UpdateAsync(it => new DroneDocktask()
{
state=3
}, it => it.id == info.id);
//返回数据
if (uow.Commit())
{
string x_lc_secret = _helper.getxseret();
// 转换为字节数组
byte[] bytes = Encoding.UTF8.GetBytes(info.taskid);
var encryptedResData = _helper.Encrypt(bytes);
Response.Result = encryptedResData;
Response.Message = "无人机机场任务取消成功";
Response.Code = 200;
Response.Secret = x_lc_secret;
return Response;
}
else
{
string x_lc_secret = _helper.getxseret();
// 转换为字节数组
byte[] bytes = Encoding.UTF8.GetBytes(" ");
var encryptedResData = _helper.Encrypt(bytes);
Response.Result = encryptedResData;
Response.Message = "无人机机场任务取消失败";
Response.Code = 500;
Response.Secret = x_lc_secret;
return Response;
}
}
else
{
string x_lc_secret = _helper.getxseret();
// 转换为字节数组
byte[] bytes = Encoding.UTF8.GetBytes(" ");
var encryptedResData = _helper.Encrypt(bytes);
Response.Result = encryptedResData;
Response.Message = "未找到任务数据";
Response.Code = 500;
Response.Secret = x_lc_secret;
return Response;
}
}
}
// 安全获取响应头值的方法
private static string GetHeaderValue(HttpResponseMessage response, string headerName)
{
if (response.Headers.TryGetValues(headerName, out IEnumerable<string> values))
{
return string.Join(", ", values); // 如果多个值则合并
}
// 尝试忽略大小写再次查找
foreach (var header in response.Headers)
{
if (header.Key.Equals(headerName, StringComparison.OrdinalIgnoreCase))
{
return string.Join(", ", header.Value);
}
}
return null; // 未找到
}
}
}

189
OpenAuth.App/ServiceApp/DroneDocking/Request/AirPortRegistReq.cs
Unescape Escape View File

@ -0,0 +1,189 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OpenAuth.App.ServiceApp.DroneDocking.Request
{
public class AirPortRegistReq
{
public string serviceUrl { get; set; }
public string liveStreampluginUrl { get; set; }
public string contacts { get; set; }
public string phone { get; set; }
}
public class AddDeviceReq
{
//区域代码
public string regioncode { get; set; }
//无人机设备id
public string deviceid { get; set; }
//无人机品牌
public string brand { get; set; }
//无人机型号
public string model { get; set; }
//无人机机场经度，保留7位小数
public double longitude { get; set; }
//无人机机场维度，保留7位小数
public double latitude { get; set; }
//无人机机场高度
public double height { get; set; }
//无人机机场飞行半径，单位米
public double radius { get; set; }
//设备类型（默认0），0表示机场无人机 1表示手持无人机
public int devicetype { get; set; }
//紧急联系人，devicetype=1时必填
public string contacts { get; set; }
//紧急联系电话 ，devicetype=1时必填
public string phone { get; set; }
}
public class AuthorizationReq
{
//无人机机场设备唯一id
public string deviceid { get; set; }
//0：不可用 1：可用
public int status { get; set; }
}
public class AirPortTaskReq
{
//无人机机场设备唯一id
public List<string> deviceid { get; set; }
/// <summary>
/// Desc:业务类型，用于标识数据来源
/// Default:
/// Nullable:False
/// </summary>
public string bizidname { get; set; }
/// <summary>
/// Desc:下发任务名称
/// Default:
/// Nullable:True
/// </summary>
public string taskname { get; set; }
/// <summary>
/// Desc:下发任务id
/// Default:
/// Nullable:True
/// </summary>
public string taskid { get; set; }
/// <summary>
/// Desc:数据类型， 用于后续成果上传获取上传路径
/// Default:
/// Nullable:False
/// </summary>
public string datacode { get; set; }
public List<TaskDetail> tasklist { get; set; }
}
public class TaskDetail
{
/// <summary>
/// Desc:图斑标识码
/// Default:
/// Nullable:True
/// </summary>
public string bsm { get; set; }
/// <summary>
/// Desc:县级行政区代码
/// Default:
/// Nullable:True
/// </summary>
public string xzqdm { get; set; }
/// <summary>
/// Desc:地块编号
/// Default:
/// Nullable:True
/// </summary>
public string dkbh { get; set; }
/// <summary>
/// Desc:地块类型
/// Default:
/// Nullable:True
/// </summary>
public string dklx { get; set; }
/// <summary>
/// Desc:子地块编号
/// Default:
/// Nullable:True
/// </summary>
public string zdkbh { get; set; }
/// <summary>
/// Desc:地块名称
/// Default:
/// Nullable:True
/// </summary>
public string dkmc { get; set; }
/// <summary>
/// Desc:地块面积
/// Default:
/// Nullable:True
/// </summary>
public decimal? dkmj { get; set; }
/// <summary>
/// Desc:地块范围，cgcs2000的经纬度坐标，wkt格式
/// Default:
/// Nullable:True
/// </summary>
public string dkfw { get; set; }
/// <summary>
/// Desc:备注
/// Default:
/// Nullable:True
/// </summary>
public string bz { get; set; }
}
public class ResData
{
/// <summary>
/// 操作消息【当Status不为 200时，显示详细的错误信息】
/// </summary>
public string Message { get; set; }
/// <summary>
/// 操作状态码，200为正常
/// </summary>
public int Code { get; set; }
public ResData()
{
Code = 200;
Message = "操作成功";
}
public string Result { get; set; }
public string Secret {get;set;}
}
public class AirPortUpdateTaskReq
{
//无人机机场设备唯一id
public List<string> deviceid { get; set; }
/// <summary>
/// Desc:下发任务id
/// Default:
/// Nullable:True
/// </summary>
public string taskid { get; set; }
public List<TaskDetail> tasklist { get; set; }
}
}

67
OpenAuth.App/ServiceApp/ManageApp.cs
Unescape Escape View File

@ -1,3 +1,4 @@
using DocumentFormat.OpenXml.Office2010.Excel;
using DocumentFormat.OpenXml.Wordprocessing;
using Infrastructure;
using Infrastructure.CloudSdk.minio;
@ -5,6 +6,7 @@ using Infrastructure.CloudSdk.wayline;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using OpenAuth.App.BaseApp.Base;
using OpenAuth.App.BasicQueryService;
using OpenAuth.App.Interface;
@ -122,6 +124,8 @@ namespace OpenAuth.App.ServiceApp
{
using (var db = UnitWork.CreateContext())
{
if (db.LasaDronePort.GetFirst(r => r.Sn == info.Sn) != null)
return false;
var flag = db.LasaDronePort.Insert(info);
if (db.Commit())
return true;
@ -169,6 +173,45 @@ namespace OpenAuth.App.ServiceApp
};
}
}
/// <summary>
/// 获取机场sn获取无人机列表
/// </summary>
/// <param name="page"></param>
/// <param name="limit"></param>
/// <param name="key"></param>
/// <returns></returns>
public async Task<Response<PageInfo<List<dynamic>>>> GetUavPageByDocksn(int page, int limit, string sn)
{
RefAsync<int> totalCount = 0;
using (var db = UnitWork.CreateContext())
{
var dockinfo = await db.LasaDronePort.GetFirstAsync(r => r.Sn == sn);
var list = await db.LasaUav.AsQueryable()
.LeftJoin<LasaDronePort>((a, b) => a.PId == b.Id)
.Where((a, b) => a.IsDelete == false)
.WhereIF(dockinfo != null, (a, b) => a.PId == dockinfo.Id)
.Select<dynamic>((a, b) => new
{
id = a.Id,
name = a.Name,
pId = a.PId,
typeId = a.TypeId,
sn = a.Sn,
psn = b.Sn,
updateTime = a.UpdateTime,
isDelete = a.IsDelete,
pName = b.Name, // 机场名称
workSpaceId = a.WorkSpaceId,
firmwareVersion = a.FirmwareVersion,
})
.ToPageListAsync(page, limit, totalCount);
return new Response<PageInfo<List<dynamic>>>
{
Result = new PageInfo<List<dynamic>> { Items = list, Total = totalCount }
};
}
}
/// <summary>
/// 编辑无人机
@ -232,6 +275,8 @@ namespace OpenAuth.App.ServiceApp
{
using (var db = UnitWork.CreateContext())
{
if (db.LasaUav.GetFirst(r => r.Sn == info.Sn) != null)
return false;
var flag = db.LasaUav.Insert(info);
if (db.Commit())
return true;
@ -990,5 +1035,27 @@ namespace OpenAuth.App.ServiceApp
Result = list
};
}
#region 基本信息统计
public async Task<Response<JObject>> GetBasicInfo()
{
using (var db = UnitWork.CreateContext())
{
var dronInfo = await db.LasaDronePort.AsQueryable().Where(r => r.IsDelete == false && r.TypeId.Contains("Dock")).CountAsync();
var otherInfo = await db.LasaDronePort.AsQueryable().Where(r => r.IsDelete == false && !r.TypeId.Contains("Dock")).CountAsync();
var pilotInfo = await db.SysUserRole.AsQueryable().Where(r => r.RoleId == 555252989157446).CountAsync();
var taskInfo = await db.LasaTask.AsQueryable().CountAsync();
JObject obj = new JObject
{
{ "dronInfo", dronInfo },
{ "otherInfo", otherInfo },
{ "pilotInfo", pilotInfo },
{ "taskInfo", taskInfo }
};
return new Response<JObject> { Result = obj, Message = "获取数据成功" };
}
}
#endregion
}
}

132
OpenAuth.App/ServiceApp/TestApp.cs
Unescape Escape View File

@ -1,132 +0,0 @@
using OpenAuth.App.BaseApp.Base;
using OpenAuth.Repository.Domain;
using OpenAuth.Repository;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Infrastructure.CloudSdk.minio;
using OpenAuth.App.BasicQueryService;
using OpenAuth.App.Interface;
using OpenAuth.WebApi;
using SqlSugar;
using Infrastructure;
using System.Security.Cryptography.X509Certificates;
using Infrastructure.Helpers;
using System.Text.Json;
using NetModular.DocX.Core;
using System.DirectoryServices.Protocols;
using OpenAuth.App.ServiceApp.Response;
using Microsoft.AspNetCore.DataProtection;
namespace OpenAuth.App.ServiceApp
{
public class TestApp : SqlSugarBaseApp<LasaDronePort, SugarDbContext>
{
private EncryptionHelper _helper;
public TestApp(EncryptionHelper helper, ISugarUnitOfWork<SugarDbContext> unitWork, ISimpleClient<LasaDronePort> repository, IAuth auth): base(unitWork, repository, auth)
{
_helper = helper;
}
public async Task<Response<string>> RegistService()
{
//using var httpClient = new HttpClient();
Response<string> Response=new Response<string>();
var handler = new HttpClientHandler();
//handler.ClientCertificates.Add(cert);
// 如果需要忽略服务器证书错误（仅测试环境）
handler.ServerCertificateCustomValidationCallback = (sender, cert, chain, sslPolicyErrors) => true;
using (var client = new HttpClient())
{
try
{
string url = "https://wp.tianmu.cloud:5443/zhcfzx/droneAirport/RegistService";
// var param = new Dictionary<string, string>()
//{
// { "serviceUrl", "https://xxx.com/mdc/v1/" },
// { "1iveStreampluginUrl", "https://ss.com/drone/v1/livestream.js" },
// { "contacts", "孟三" },
// { "phone", "18390849120" },
//};
string json= "{" +
"\"serviceUrl\": \"https://xxx.com/mdc/v1/\"," +
"\"liveStreampluginUrl\": \"https://xxx.com/drone/v1/livestream.js\"," +
"\"contacts\": \"孟三\"," +
"\"phone\": \"18390849120\"" +
"}";
string x_lc_secret = _helper.getxseret();
string centercode = "UAV32_LJY2FPMYDE6UDES3P3ZD7V3IKQ";
string x_token = _helper.GetToken(centercode);
// 序列化为 JSON 字符串
//string json = JsonSerializer.Serialize(param);
// 转换为字节数组
byte[] bytes = Encoding.UTF8.GetBytes(json);
var encryptedData = _helper.Encrypt(bytes);
// 创建请求体
var httpContent = new StringContent(encryptedData, Encoding.UTF8, "application/json");
// 添加请求头
client.DefaultRequestHeaders.Add("x-lc-secret", x_lc_secret);
client.DefaultRequestHeaders.Add("x-lc-token", x_token);
//发送请求
HttpResponseMessage response = await client.PostAsync(url, httpContent);
response.EnsureSuccessStatusCode();
// 获取响应头中的 x_cl_screte 参数
string resx_cl_screte = GetHeaderValue(response, "x-lc-secret");
// 读取响应内容并反序列化
string responseBody = await response.Content.ReadAsStringAsync();
var result = JsonSerializer.Deserialize<ReciveData<string>>(responseBody);
//解密数据
byte[] resbytesx = Convert.FromBase64String(resx_cl_screte);
byte[] resdatabytes = Convert.FromBase64String(result?.data);
string data = _helper.Decrypt(resbytesx, resdatabytes);
Response.Result = data;
Response.Message = result.message;
Response.Result = result.code.ToString();
}
catch (HttpRequestException e)
{
Console.WriteLine("\nException Caught!");
Console.WriteLine("Message :{0} ", e.Message);
Response.Result = "连接错误";
}
}
return Response;
}
// 安全获取响应头值的方法
private static string GetHeaderValue(HttpResponseMessage response, string headerName)
{
if (response.Headers.TryGetValues(headerName, out IEnumerable<string> values))
{
return string.Join(", ", values); // 如果多个值则合并
}
// 尝试忽略大小写再次查找
foreach (var header in response.Headers)
{
if (header.Key.Equals(headerName, StringComparison.OrdinalIgnoreCase))
{
return string.Join(", ", header.Value);
}
}
return null; // 未找到
}
}
}

68
OpenAuth.Repository/Domain/DroneDocktask.cs
Unescape Escape View File

@ -0,0 +1,68 @@
using System;
using System.Linq;
using System.Text;
using SqlSugar;
namespace OpenAuth.Repository.Domain
{
///<summary>
///省对接无人机任务表
///</summary>
[SugarTable("drone_docktask")]
public partial class DroneDocktask
{
public DroneDocktask(){
}
/// <summary>
/// Desc:主键
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey=true)]
public string id {get;set;}
/// <summary>
/// Desc:无人机机场设备唯一id（多个）
/// Default:
/// Nullable:True
/// </summary>
public string deviceid {get;set;}
/// <summary>
/// Desc:业务类型，用于标识数据来源
/// Default:
/// Nullable:False
/// </summary>
public string bizidname {get;set;}
/// <summary>
/// Desc:下发任务名称
/// Default:
/// Nullable:True
/// </summary>
public string taskname {get;set;}
/// <summary>
/// Desc:下发任务id
/// Default:
/// Nullable:True
/// </summary>
public string taskid {get;set;}
/// <summary>
/// Desc:数据类型， 用于后续成果上传获取上传路径
/// Default:
/// Nullable:False
/// </summary>
public string datacode {get;set;}
/// <summary>
/// 任务是否开始执行（0未开始，1已开始，2已完成，3已取消）
/// </summary>
public int state { get; set;}
public DateTime? createtime { get; set; }
}
}

97
OpenAuth.Repository/Domain/DroneDocktaskdetail.cs
Unescape Escape View File

@ -0,0 +1,97 @@
using System;
using System.Linq;
using System.Text;
using SqlSugar;
namespace OpenAuth.Repository.Domain
{
///<summary>
///省对接，任务添加详情
///</summary>
[SugarTable("drone_docktaskdetail")]
public partial class DroneDocktaskdetail
{
public DroneDocktaskdetail(){
}
/// <summary>
/// Desc:主键
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey=true)]
public string id {get;set;}
/// <summary>
/// Desc:图斑标识码
/// Default:
/// Nullable:True
/// </summary>
public string bsm {get;set;}
/// <summary>
/// Desc:县级行政区代码
/// Default:
/// Nullable:True
/// </summary>
public string xzqdm {get;set;}
/// <summary>
/// Desc:地块编号
/// Default:
/// Nullable:True
/// </summary>
public string dkbh {get;set;}
/// <summary>
/// Desc:地块类型
/// Default:
/// Nullable:True
/// </summary>
public string dklx {get;set;}
/// <summary>
/// Desc:子地块编号
/// Default:
/// Nullable:True
/// </summary>
public string zdkbh {get;set;}
/// <summary>
/// Desc:地块名称
/// Default:
/// Nullable:True
/// </summary>
public string dkmc {get;set;}
/// <summary>
/// Desc:地块面积
/// Default:
/// Nullable:True
/// </summary>
public decimal? dkmj {get;set;}
/// <summary>
/// Desc:地块范围，cgcs2000的经纬度坐标，wkt格式
/// Default:
/// Nullable:True
/// </summary>
public string dkfw {get;set;}
/// <summary>
/// Desc:备注
/// Default:
/// Nullable:True
/// </summary>
public string bz {get;set;}
/// <summary>
/// Desc:任务id，对应任务表id
/// Default:
/// Nullable:True
/// </summary>
public string taskid {get;set;}
}
}

24
OpenAuth.Repository/Domain/LasaDeviceDictionary.cs
Unescape Escape View File

@ -0,0 +1,24 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OpenAuth.Repository.Domain
{
/// <summary>
/// 设备类型字典
/// </summary>
[SugarTable("lasa_devicedictionary‌")]
public class LasaDeviceDictionary
{
[SugarColumn(IsPrimaryKey = true)]
public string Id { get; set; }
public int Domain { get; set; }
public int DeviceType { get; set; }
public int SubType { get; set; }
public string DeviceName { get; set; }
public string DeviceDesc { get; set; }
}
}

1
OpenAuth.Repository/Domain/LasaDronePort‌.cs
Unescape Escape View File

@ -26,6 +26,7 @@ namespace OpenAuth.Repository.Domain
[SugarColumn(DefaultValue = "false")]
public bool IsDelete { get; set; }
public string WorkSpaceId { get; set; }
public string GateWay { get; set; }
[Navigate(NavigateType.OneToMany, nameof(LasaUav.PId))]
public List<LasaUav> UavList { get; set; }
}

2
OpenAuth.Repository/Domain/LasaLog.cs
Unescape Escape View File

@ -45,6 +45,6 @@ namespace OpenAuth.Repository.Domain
/// Nullable:True
/// </summary>
[SugarColumn(IsJson = true)]
public JsonObject Data { get; set; }
public string Data { get; set; }
}
}

3
OpenAuth.Repository/SugarDbContext.cs
Unescape Escape View File

@ -75,6 +75,9 @@ namespace OpenAuth.Repository
public SugarRepositiry<LasaManageDeviceHms> LasaManageDeviceHms { get; set; }
public SugarRepositiry<LasaLog> LasaLog { get; set; }
public SugarRepositiry<LasaFirmware> LasaFirmware { get; set; }
public SugarRepositiry<LasaDeviceDictionary> LasaDeviceDictionary { get; set; }
public SugarRepositiry<DroneDocktaskdetail> DroneDocktaskdetail { get; set; }
public SugarRepositiry<DroneDocktask> DroneDocktask { get; set; }
#endregion
}
}

84
OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs
Unescape Escape View File

@ -342,6 +342,63 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
}
/// <summary>
/// 关联minio
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<Response<int>> RefMinio(Zhibo zhiboReq)
{
Response<int> response = new Response<int>();
try
{
var videoids = zhiboReq.videoId.Split("/");
var topicRequest = $"thing/product/" + videoids[0] + "/requests_reply";
var requestData = new
{
bid = Guid.NewGuid().ToString(),
method = "storage_config_get",
tid = Guid.NewGuid().ToString(),
timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
data = new
{
output = new
{
bucket = "test",
credentials = new
{
access_key_id = "minioadmin",
access_key_secret = "minioadmin",
expire = 3600,
security_token = "security_token"
},
endpoint = "175.27.168.120:6013",
object_key_prefix = "",
provider = "ali",
region = "hz"
},
result = 0
}
};
response.Result = 0;
}
catch (Exception ex)
{
response.Code = 500;
response.Message = ex.Message;
}
return response;
}
/// <summary>
/// 开始直播
@ -537,5 +594,32 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
return result;
}
#endregion
#region 日志信息
/// <summary>
/// 根据设备sn读取实时数据
/// </summary>
/// <param name="sn">设备sn</param>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <param name="page"></param>
/// <param name="limit"></param>
/// <returns></returns>
[HttpGet]
public async Task<Response<PageInfo<List<LasaLog>>>> GetLogList(string sn, DateTime startTime, DateTime endTime, int page, int limit)
{
var result = new Response<PageInfo<List<LasaLog>>>();
try
{
result = await _app.GetLogList(sn, startTime, endTime, page, limit);
}
catch (Exception ex)
{
result.Code = 500;
result.Message = ex.Message;
}
return result;
}
#endregion
}
}

283
OpenAuth.WebApi/Controllers/ServiceControllers/DroneDockController.cs
Unescape Escape View File

@ -0,0 +1,283 @@
using Infrastructure;
using Infrastructure.Cache;
using Infrastructure.Helpers;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App.ServiceApp.DroneDocking;
using OpenAuth.App.ServiceApp.DroneDocking.Request;
using OpenAuth.App.ServiceApp.Response;
using System.Text;
namespace OpenAuth.WebApi.Controllers.ServiceControllers
{
/// <summary>
/// 对接
/// </summary>
[Route("api/[controller]/[action]")]
[ApiController]
public class DroneDockController: ControllerBase
{
private readonly DroneDockApp _app;
private EncryptionHelper _helper;
public DroneDockController(DroneDockApp app,EncryptionHelper helper)
{
_app = app;
_helper = helper;
}
/// <summary>
/// 无人机机场接口注册/更新
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public async Task<Response<string>> RegistService([FromBody] AirPortRegistReq req)
{
var result = new Response<string>();
try
{
result = await _app.RegistService(req);
}
catch (Exception ex)
{
result.Code = 500;
result.Message = ex.Message;
}
return result;
}
/// <summary>
/// 无人机机场设备注册/更新
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public async Task<Response<string>> AddDevice([FromBody] AddDeviceReq req)
{
var result = new Response<string>();
try
{
result = await _app.AddDevice(req);
}
catch (Exception ex)
{
result.Code = 500;
result.Message = ex.Message;
}
return result;
}
/// <summary>
/// 无人机机场设备授权
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public async Task<Response<string>> Authorization([FromBody] AuthorizationReq req)
{
var result = new Response<string>();
try
{
result = await _app.Authorization(req);
}
catch (Exception ex)
{
result.Code = 500;
result.Message = ex.Message;
}
return result;
}
[HttpGet]
[AllowAnonymous]
public async Task<Response<string>> Test(string taskid)
{
var result = new Response<string>();
try
{
result = await _app.Test1(taskid);
}
catch (Exception ex)
{
result.Code = 500;
result.Message = ex.Message;
}
return result;
}
/// <summary>
/// 无人机任务添加
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
[Route("/zhcfzx/droneAirport/AddTask")]
[HttpPost]
[AllowAnonymous]
public async Task<ReciveData<string>> AddTask(string recivedata)
{
var result = new ReciveData<string>();
if(Request.Headers.TryGetValue("x-lc-token", out var tokenValue))
{
var tokenflag = _helper.Verify(tokenValue);
if (tokenflag)
{
// 获取请求头中的x-lc-secret
if (Request.Headers.TryGetValue("x-lc-secret", out var secretValue))
{
string secret = secretValue.ToString();
try
{
// 1. 从请求体中直接读取原始字符串（即 encryptedData）
string req;
using (var reader = new StreamReader(Request.Body, Encoding.UTF8))
{
req = await reader.ReadToEndAsync();
}
var data = await _app.AddTask(req, secret);
result.data = data.Result;
result.code=data.Code;
result.message = data.Message;
Request.Headers.TryGetValue("traceid", out var traceid);
result.traceid = traceid;
Response.Headers.Add("x-lc-secret", data.Secret);
}
catch (Exception ex)
{
result.code = 200;
result.message = "error";
Request.Headers.TryGetValue("traceid", out var traceid);
result.traceid = traceid;
}
return result;
}
else
{
throw new Exception("Missing required header: x-lc-secret");
}
}
else
{
throw new Exception("unauthorized");
}
}
else
{
throw new Exception("Missing required header: x-lc-token");
}
}
/// <summary>
/// 无人机任务更新
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
[Route("/zhcfzx/droneAirport/updateTask")]
[HttpPost]
[AllowAnonymous]
public async Task<ReciveData<string>> updateTask(string recivedata)
{
var result = new ReciveData<string>();
if (Request.Headers.TryGetValue("x-lc-token", out var tokenValue))
{
var tokenflag = _helper.Verify(tokenValue);
if (tokenflag)
{
// 获取请求头中的x-lc-secret
if (Request.Headers.TryGetValue("x-lc-secret", out var secretValue))
{
string secret = secretValue.ToString();
try
{
// 1. 从请求体中直接读取原始字符串（即 encryptedData）
string req;
using (var reader = new StreamReader(Request.Body, Encoding.UTF8))
{
req = await reader.ReadToEndAsync();
}
var data = await _app.UpdateTask(req, secret);
result.data = data.Result;
result.code = data.Code;
result.message = data.Message;
Request.Headers.TryGetValue("traceid", out var traceid);
result.traceid = traceid;
Response.Headers.Add("x-lc-secret", data.Secret);
}
catch (Exception ex)
{
result.code = 200;
result.message = "error";
Request.Headers.TryGetValue("traceid", out var traceid);
result.traceid = traceid;
}
return result;
}
else
{
throw new Exception("Missing required header: x-lc-secret");
}
}
else
{
throw new Exception("unauthorized");
}
}
else
{
throw new Exception("Missing required header: x-lc-token");
}
}
/// <summary>
/// 取消无人机任务
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
[Route("/zhcfzx/droneAirport/cancelTask")]
[HttpGet]
[AllowAnonymous]
public async Task<ReciveData<string>> cancelTask(string taskid)
{
var result = new ReciveData<string>();
if (Request.Headers.TryGetValue("x-lc-token", out var tokenValue))
{
var tokenflag = _helper.Verify(tokenValue);
if (tokenflag)
{
try
{
var data = await _app.CancelTask(taskid);
result.data = data.Result;
result.code = data.Code;
result.message = data.Message;
Request.Headers.TryGetValue("traceid", out var traceid);
result.traceid = traceid;
Response.Headers.Add("x-lc-secret", data.Secret);
}
catch (Exception ex)
{
result.code = 200;
result.message = "error";
Request.Headers.TryGetValue("traceid", out var traceid);
result.traceid = traceid;
}
return result;
}
else
{
throw new Exception("unauthorized");
}
}
else
{
throw new Exception("Missing required header: x-lc-token");
}
}
}
}

36
OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs
Unescape Escape View File

@ -6,6 +6,7 @@ using Infrastructure.Helpers;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using OpenAuth.App.ServiceApp;
using OpenAuth.App.ServiceApp.Request;
using OpenAuth.App.ServiceApp.Response;
@ -146,6 +147,29 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
{
return await _app.DeleteUav(id);
}
/// <summary>
/// 根据机场sn获取无人机列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="sn"></param>
/// <returns></returns>
[HttpGet]
public async Task<Response<PageInfo<List<dynamic>>>> GetUavPageByDocksn(int page, int limit, string sn)
{
var result = new Response<PageInfo<List<dynamic>>>();
try
{
result = await _app.GetUavPageByDocksn(page, limit, sn);
}
catch (Exception ex)
{
result.Code = 500;
result.Message = ex.Message;
}
return result;
}
#endregion
@ -604,5 +628,17 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
}
#endregion
#region 基本信息
/// <summary>
/// 获取基本信息
/// </summary>
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<Response<JObject>> GetBasicInfo()
{
return await _app.GetBasicInfo();
}
#endregion
}
}

44
OpenAuth.WebApi/Controllers/ServiceControllers/TestController.cs
Unescape Escape View File

@ -1,44 +0,0 @@
using Infrastructure;
using Infrastructure.Cache;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App.ServiceApp;
namespace OpenAuth.WebApi.Controllers.ServiceControllers
{
/// <summary>
/// 对接
/// </summary>
[Route("api/[controller]/[action]")]
[ApiController]
public class TestController: ControllerBase
{
private readonly TestApp _app;
public TestController(TestApp app)
{
_app = app;
}
/// <summary>
/// 测试接口
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public async Task<Response<string>> RegistService()
{
var result = new Response<string>();
try
{
result = await _app.RegistService();
}
catch (Exception ex)
{
result.Code = 500;
result.Message = ex.Message;
}
return result;
}
}
}

15
OpenAuth.WebApi/Model/mqtt/MqttHostedService.cs
Unescape Escape View File

@ -1,6 +1,8 @@
using Infrastructure.CloudSdk.mqttmessagecenter;
using NPOI.SS.Formula.Functions;
using NuGet.Packaging;
using OpenAuth.App.ServiceApp;
using System.Security.Cryptography;
namespace OpenAuth.WebApi.Model.mqtt
{
@ -26,7 +28,7 @@ namespace OpenAuth.WebApi.Model.mqtt
handlers,
server: "175.27.168.120",
port: 6011,
clientId: "mqtt_client_1582",
clientId: Guid.NewGuid().ToString(),
username: "sdhc",
password: ""
);
@ -44,7 +46,16 @@ namespace OpenAuth.WebApi.Model.mqtt
$"thing/product/{gateway}/services_reply",
//$"thing/product/{gateway}/drc/up",
//$"thing/product/{gateway}/drc/down",
$"thing/product/{gateway}/state"
$"sys/product/{gateway}/status"
});
}
var snList = await _app.GetUavSn();
foreach (var sn in snList)
{
topics.AddRange(new[]
{
$"thing/product/{sn}/osd"
});
}
await _mqttCenter.ConnectAndSubscribeAsync(topics.ToArray());

2
OpenAuth.WebApi/Model/mqtt/ThingOsdHandler.cs
Unescape Escape View File

@ -34,7 +34,7 @@ namespace OpenAuth.WebApi.Model.mqtt
Topic = topic,
Method = root["method"]?.ToString() ?? "",
CreateTime = DateTime.Now,
Data = root
Data = payload
});
var sub_device = root["data"]?["sub_device"]?.ToString() ?? "";
if (!string.IsNullOrEmpty(sub_device))

19
OpenAuth.WebApi/Model/mqtt/ThingRequestHandler.cs
Unescape Escape View File

@ -12,13 +12,15 @@ namespace OpenAuth.WebApi.Model.mqtt
private readonly MqttClientManager _mqttClientManager;
AirportMaintenanceApp _app;
ManageApp _manageApp;
private readonly MqttMessageCenter _mqttCenter;
public ThingRequestHandler(ILogger<ThingRequestHandler> logger, MqttClientManager mqttClientManager, AirportMaintenanceApp app, ManageApp manageApp)
public ThingRequestHandler(ILogger<ThingRequestHandler> logger, MqttClientManager mqttClientManager, AirportMaintenanceApp app, ManageApp manageApp, MqttMessageCenter mqttCenter)
{
_logger = logger;
_mqttClientManager = mqttClientManager;
_app = app;
_manageApp = manageApp;
_mqttCenter = mqttCenter;
}
public bool CanHandle(string topic)
@ -137,7 +139,7 @@ namespace OpenAuth.WebApi.Model.mqtt
}
if (payload.Contains("airport_organization_bind"))
{
string getway = topic.Split('/')[2];
// 解析 JSON
var root = JsonNode.Parse(payload)?.AsObject();
// 获取 bind_devices 数组
@ -159,8 +161,9 @@ namespace OpenAuth.WebApi.Model.mqtt
lasaDronePort.TypeId = "Dock 3";
lasaDronePort.Sn = obj["sn"].ToString();
lasaDronePort.BindStatus = 1;
lasaDronePort.Name = "机场";
lasaDronePort.Name = obj["device_callsign"]?.ToString();
dronesn = obj["sn"].ToString();
lasaDronePort.GateWay = getway;
}
else
{
@ -170,7 +173,7 @@ namespace OpenAuth.WebApi.Model.mqtt
lasaUav.TypeId = "M4TD";
lasaUav.Sn = obj["sn"].ToString();
lasaUav.PId = lasaDronePort.Id;
lasaUav.Name = "飞行器";
lasaUav.Name = obj["device_callsign"]?.ToString();
uavsn = obj["sn"].ToString();
}
}
@ -178,6 +181,13 @@ namespace OpenAuth.WebApi.Model.mqtt
uavsn = uavsn == "" ? "1581F8HGX254V00A0BUY" : uavsn;
_manageApp.AddDronePort(lasaDronePort);
_manageApp.AddLasaUav(lasaUav);
var topics = new List<string>();
topics.AddRange(new[]
{
$"sys/product/{dronesn}/osd",
$"sys/product/{uavsn}/osd",
});
await _mqttCenter.SubscribeAsync(topics.ToArray());
var requestData = new
{
bid = Guid.NewGuid().ToString(),
@ -206,7 +216,6 @@ namespace OpenAuth.WebApi.Model.mqtt
method = "airport_organization_bind"
};
string payloadreq = JsonSerializer.Serialize(requestData);
string getway = topic.Split('/')[2];
await _mqttClientManager.PublishAsync($"thing/product/{getway}/requests_reply", payloadreq);
}
}

39
OpenAuth.WebApi/Model/mqtt/ThingStateHandler.cs
Unescape Escape View File

@ -1,39 +0,0 @@
using Infrastructure.CloudSdk.mqttmessagecenter;
using OpenAuth.App.ServiceApp;
using OpenAuth.Repository.Domain;
using System.Text.Json.Nodes;
namespace OpenAuth.WebApi.Model.mqtt
{
public class ThingStateHandler : IMqttMessageHandler
{
private readonly ILogger<ThingStateHandler> _logger;
AirportMaintenanceApp _app;
public ThingStateHandler(ILogger<ThingStateHandler> logger, AirportMaintenanceApp app)
{
_logger = logger;
_app = app;
}
public bool CanHandle(string topic)
{
return topic.Contains("/state");
}
public Task HandleAsync(string topic, string payload)
{
_logger.LogError($"[Service] Topic={topic}, Payload={payload}");
Console.WriteLine($"[Service] Topic={topic}, Payload={payload}");
var root = JsonNode.Parse(payload)?.AsObject();
_app.AddLog(new LasaLog
{
Id = Guid.NewGuid().ToString(),
Topic = topic,
Method = root["method"]?.ToString() ?? "",
CreateTime = DateTime.Now,
Data = root
});
return Task.CompletedTask;
}
}
}

58
OpenAuth.WebApi/Model/mqtt/ThingStatusHandler.cs
Unescape Escape View File

@ -0,0 +1,58 @@
using Infrastructure.CloudSdk.mqttmessagecenter;
using OpenAuth.App.ServiceApp;
using OpenAuth.Repository.Domain;
using System.Text.Json;
using System.Text.Json.Nodes;
namespace OpenAuth.WebApi.Model.mqtt
{
public class ThingStatusHandler : IMqttMessageHandler
{
private readonly ILogger<ThingStatusHandler> _logger;
AirportMaintenanceApp _app;
private readonly MqttClientManager _mqttClientManager;
public ThingStatusHandler(ILogger<ThingStatusHandler> logger, AirportMaintenanceApp app, MqttClientManager mqttClientManager)
{
_logger = logger;
_app = app;
_mqttClientManager = mqttClientManager;
}
public bool CanHandle(string topic)
{
return topic.Contains("/status");
}
public async Task HandleAsync(string topic, string payload)
{
_logger.LogError($"[Service] Topic={topic}, Payload={payload}");
Console.WriteLine($"[Service] Topic={topic}, Payload={payload}");
if (payload.Contains("update_topo"))
{
var root = JsonNode.Parse(payload)?.AsObject();
if (root == null)
{
return;
}
var bid = root["bid"]?.ToString() ?? "";
var tid = root["tid"]?.ToString() ?? "";
var timestamp = long.Parse(root["timestamp"]?.ToString() ?? "0");
var requestData = new
{
bid = bid,
method = "update_topo",
tid = tid,
timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
data = new
{
result = 0,
}
};
string getway = topic.Split('/')[2];
string payloadreq = JsonSerializer.Serialize(requestData);
await _mqttClientManager.PublishAsync($"sys/product/{getway}/status_reply", payloadreq);
}
}
}
}

3
OpenAuth.WebApi/Startup.cs
Unescape Escape View File

@ -177,6 +177,7 @@ namespace OpenAuth.WebApi
services.AddSingleton<IMqttMessageHandler, ThingOsdHandler>();
services.AddSingleton<IMqttMessageHandler, ThingEventHandler>();
//services.AddSingleton<IMqttMessageHandler, ThingDrcHandler>();
services.AddSingleton<IMqttMessageHandler, ThingStatusHandler>();
services.AddHostedService<MqttHostedService>();
#endregion
@ -341,7 +342,7 @@ namespace OpenAuth.WebApi
#endregion
}
public void ConfigureContainer(ContainerBuilder builder)

3
OpenAuth.WebApi/appsettings.json
Unescape Escape View File

@ -81,5 +81,8 @@
"SecretKey": "minioadmin",
"BucketName": "test",
"limitspeed": 1048576
},
"DroneDocking": {
"Url": "https://wp.tianmu.cloud:5443/zhcfzx"
}
}

Write Preview
Loading…
Cancel
Save