fix 命名修改
This commit is contained in:
@@ -42,7 +42,7 @@ public class DevicesConnectController : ControllerBase
|
|||||||
[IgnoreTenant]
|
[IgnoreTenant]
|
||||||
public async Task<string> ResigterAsync(DeviceResigterRequest request)
|
public async Task<string> ResigterAsync(DeviceResigterRequest request)
|
||||||
{
|
{
|
||||||
return await _deviceConnectService.ResigterAsync(request);
|
return await _deviceConnectService.RegisterAsync(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -65,9 +65,9 @@ public class DevicesController : ControllerBase
|
|||||||
[Obsolete("迁移到DeviceConnect")]
|
[Obsolete("迁移到DeviceConnect")]
|
||||||
[HttpPost("resigter")]
|
[HttpPost("resigter")]
|
||||||
[IgnoreTenant]
|
[IgnoreTenant]
|
||||||
public async Task<string> ResigterAsync(DeviceResigterRequest request)
|
public async Task<string> RegisterAsync(DeviceResigterRequest request)
|
||||||
{
|
{
|
||||||
return await _deviceConnectService.ResigterAsync(request);
|
return await _deviceConnectService.RegisterAsync(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -138,7 +138,7 @@ public class DevicesController : ControllerBase
|
|||||||
[HttpPost("businessplaces")]
|
[HttpPost("businessplaces")]
|
||||||
public async Task SetResigterBusinessPlaceAsync(DeviceSetResigterBusinessPlaceRequest request)
|
public async Task SetResigterBusinessPlaceAsync(DeviceSetResigterBusinessPlaceRequest request)
|
||||||
{
|
{
|
||||||
await _deviceConnectService.SetResigterBusinessPlaceAsync(request);
|
await _deviceConnectService.SetRegisterBusinessPlaceAsync(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ public interface IDeviceConnectService : IScopeDependency
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="request"></param>
|
/// <param name="request"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
Task<string> ResigterAsync(DeviceResigterRequest request);
|
Task<string> RegisterAsync(DeviceResigterRequest request);
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -24,7 +24,7 @@ public interface IDeviceConnectService : IScopeDependency
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="request"></param>
|
/// <param name="request"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
Task SetResigterBusinessPlaceAsync(DeviceSetResigterBusinessPlaceRequest request);
|
Task SetRegisterBusinessPlaceAsync(DeviceSetResigterBusinessPlaceRequest request);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 设备心跳
|
/// 设备心跳
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ public class DeviceConnectService : IDeviceConnectService
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public async Task<string> ResigterAsync(DeviceResigterRequest request)
|
public async Task<string> RegisterAsync(DeviceResigterRequest request)
|
||||||
{
|
{
|
||||||
var businessPlace = await _dbContext.Queryable<BusinessPlaceEntity>().Where(x => x.CustomCode == request.BusinessCustomCode).FirstAsync();
|
var businessPlace = await _dbContext.Queryable<BusinessPlaceEntity>().Where(x => x.CustomCode == request.BusinessCustomCode).FirstAsync();
|
||||||
businessPlace.ThrowIfNull("营业点不存在");
|
businessPlace.ThrowIfNull("营业点不存在");
|
||||||
@@ -32,7 +32,7 @@ public class DeviceConnectService : IDeviceConnectService
|
|||||||
|
|
||||||
if (registry == null)
|
if (registry == null)
|
||||||
{
|
{
|
||||||
registry = new DeviceRegistryEntity()
|
registry = new DeviceRegistryEntity
|
||||||
{
|
{
|
||||||
DeviceUniqueNo = request.UniqueNo,
|
DeviceUniqueNo = request.UniqueNo,
|
||||||
LastHeartbeatTime = DateTime.Now,
|
LastHeartbeatTime = DateTime.Now,
|
||||||
@@ -60,7 +60,7 @@ public class DeviceConnectService : IDeviceConnectService
|
|||||||
return devices.Adapt<List<DeviceNotSetBusinessPlaceResponse>>();
|
return devices.Adapt<List<DeviceNotSetBusinessPlaceResponse>>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task SetResigterBusinessPlaceAsync(DeviceSetResigterBusinessPlaceRequest request)
|
public async Task SetRegisterBusinessPlaceAsync(DeviceSetResigterBusinessPlaceRequest request)
|
||||||
{
|
{
|
||||||
var device = await GetEnableDeviceAsync(request.UniqueNo);
|
var device = await GetEnableDeviceAsync(request.UniqueNo);
|
||||||
(device.Type != DeviceTypeEnumType.Meal).ThrowIfTrue("非就餐类型设备,无法设置");
|
(device.Type != DeviceTypeEnumType.Meal).ThrowIfTrue("非就餐类型设备,无法设置");
|
||||||
|
|||||||
@@ -14,6 +14,9 @@
|
|||||||
<Content Remove="log\**" />
|
<Content Remove="log\**" />
|
||||||
<EmbeddedResource Remove="log\**" />
|
<EmbeddedResource Remove="log\**" />
|
||||||
<None Remove="log\**" />
|
<None Remove="log\**" />
|
||||||
|
<Content Update="appsettings.Development.json">
|
||||||
|
<DependentUpon>appsettings.json</DependentUpon>
|
||||||
|
</Content>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
Reference in New Issue
Block a user