g82tt/SecMPS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

G1-G2: A1-A3自注册+BaseUrl修复+心跳重试+语法规范化+废弃标记

Browse Source
This commit is contained in:
g82tt
2026-06-03 23:47:43 +08:00
parent faf8930de4
commit 5467f0c0e2
3 changed files with 86 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api_sqlsugar/Warehouse/Services/device_manager/Partial/base_deviceService.cs
View File

@@ -59,7 +59,8 @@ namespace Warehouse.Services
/// <param name="d">同步设备条目</param>
/// <param name="gatewayNodeId">网关节点ID</param>
/// <param name="existingIds">已有设备映射表 (AdapterCode, SourceId) → DeviceId</param>
public async Task UpsertDeviceAsync(SyncDeviceItem d, int gatewayNodeId, Dictionary<(string, string), int> existingIds)
[Obsolete("已迁移至 gateway_nodesService.SyncDevicesAsync")]
public async Task UpsertDeviceAsync(SyncDeviceItem d, int gatewayNodeId, Dictionary<(string, string), int> existingIds)
{
var db = _repository.DbContext;
var key = (d.AdapterCode, d.SourceId);

8
api_sqlsugar/Warehouse/Services/device_manager/Partial/gateway_nodesService.cs
View File

@@ -49,8 +49,8 @@ namespace Warehouse.Services
/// </summary>
public async Task<gateway_nodes> RegisterNodeAsync(string nodeCode, string token, string adapterTypes, string baseUrl)
{
var existing = _repository.DbContext.Queryable<gateway_nodes>()
.First(x => x.NodeCode == nodeCode);
var existing = await _repository.FindAsIQueryable<gateway_nodes>()
.FirstOrDefaultAsync(x => x.NodeCode == nodeCode);
gateway_nodes entity;
if (existing != null)
@@ -91,8 +91,8 @@ namespace Warehouse.Services
/// </summary>
public async Task UpdateHeartbeatAsync(string nodeCode, string token)
{
var entity = _repository.DbContext.Queryable<gateway_nodes>()
.First(x => x.NodeCode == nodeCode && x.NodeToken == token);
var entity = _repository.FindAsIQueryable<gateway_nodes>()
.FirstOrDefaultAsync(x => x.NodeCode == nodeCode && x.NodeToken == token);
if (entity == null)
throw new UnauthorizedAccessException("认证失败：NodeCode 或 Token 无效");