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

Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/LASAPlatform

feature-flyModify
zhangbin 2025-09-10 10:37:28 +08:00
parent fadd185dfb e08a671ef7
commit f24c5b6b14
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs
View File

@ -879,9 +879,9 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
var result = JsonSerializer.Deserialize<ReciveData<string>>(responseBody);
Console.WriteLine($"无人机状态上报结果：{responseBody}");
//解密数据
byte[] resbytesx = Convert.FromBase64String(resxClScrete);
/*byte[] resbytesx = Convert.FromBase64String(resxClScrete);
byte[] resdatabytes = Convert.FromBase64String(result?.data);
string data = _helper.Decrypt(resbytesx, resdatabytes);
string data = _helper.Decrypt(resbytesx, resdatabytes);*/
// 结果
}
catch (HttpRequestException e)

18
OpenAuth.App/ServiceApp/Subscribe/ConfigSubscribe.cs
View File

@ -550,15 +550,6 @@ public class ConfigSubscribe : IJob
{
string flightId1 = (string)data.output.ext.flight_id;
var waylineMissionState = (int)data.output.ext.wayline_mission_state;
// current_step
var isHandle = IsDuplicate(Md5.Encrypt($"{result.bid}{flightId1}"));
_logger.LogDebug($"md5: {isHandle} 重复否：{IsDuplicate(Md5.Encrypt(message))}" +
$"主题：{topic} 信息：{message} ");
if (isHandle)
{
_logger.LogInformation("跳过处理");
break;
}
_logger.LogDebug("航线进度未跳过处理");
code = data.result; // result
@ -639,6 +630,15 @@ public class ConfigSubscribe : IJob
_logger.LogDebug($"航线进度：{waylineMissionState} {step} {message}");
if (step.Equals(25)) // todo 关于会接收到不同消息问题，如何处理
{
// current_step
var isHandle = IsDuplicate(Md5.Encrypt($"{result.bid}{flightId1}"));
_logger.LogDebug($"md5: {isHandle} 重复否：{IsDuplicate(Md5.Encrypt(message))}" +
$"主题：{topic} 信息：{message} ");
if (isHandle)
{
_logger.LogInformation("跳过处理");
break;
}
var task = await _sqlSugarClient.Queryable<LasaTask>()
.FirstAsync(y => y.Id == taskAssign1.TaskId);
if (task != null && !string.IsNullOrEmpty(task.AIInspection) &&