fix 数据绑定调整
This commit is contained in:
@@ -26,7 +26,9 @@ public class DeviceConnectService : IDeviceConnectService
|
||||
|
||||
public async Task<string> RegisterAsync(DeviceRegisterRequest request)
|
||||
{
|
||||
var businessPlace = await _dbContext.Queryable<BusinessPlaceEntity>().Where(x => x.CustomCode == request.BusinessCustomCode).SingleAsync();
|
||||
var businessPlace = await _dbContext.Queryable<BusinessPlaceEntity>()
|
||||
.Where(x => x.CustomCode == request.BusinessCustomCode)
|
||||
.SingleAsync();
|
||||
businessPlace.ThrowIfNull("营业点不存在");
|
||||
|
||||
var device = await GetEnableDeviceAsync(request.UniqueNo, false, request.DeployPlace, businessPlace.TenantId);
|
||||
@@ -47,8 +49,7 @@ public class DeviceConnectService : IDeviceConnectService
|
||||
DeviceUniqueNo = request.UniqueNo,
|
||||
LastHeartbeatTime = DateTime.Now,
|
||||
RegisterTime = DateTime.Now,
|
||||
BusinessPlaceCode = businessPlace.Code,
|
||||
TenantId = device.TenantId
|
||||
BusinessPlaceCode = businessPlace.Code
|
||||
};
|
||||
|
||||
await _dbContext.InsertAsync(registry);
|
||||
@@ -163,7 +164,6 @@ public class DeviceConnectService : IDeviceConnectService
|
||||
private async Task<DeviceEntity> GetEnableDeviceAsync(string uniqueNo, bool checkExists = true, string deployPlace = "", string tenantId = "")
|
||||
{
|
||||
var device = await _dbContext.Queryable<DeviceEntity>().Where(x => x.UniqueNo == uniqueNo).SingleAsync();
|
||||
|
||||
if (checkExists)
|
||||
{
|
||||
device.ThrowIfNull($"未知的设备唯一编码{uniqueNo}");
|
||||
@@ -195,14 +195,6 @@ public class DeviceConnectService : IDeviceConnectService
|
||||
|
||||
await _dbContext.InsertAsync(device);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (tenantId.IsPresent())
|
||||
{
|
||||
device.TenantId = tenantId;
|
||||
await _dbContext.UpdateAsync(device);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return device;
|
||||
|
||||
Reference in New Issue
Block a user