yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 命名修改

Browse Source
This commit is contained in:
liguoyang
2024-05-07 12:54:39 +08:00
parent 46450cc15b
commit 922ed7211d
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.Basic/Device/Controllers/DevicesConnectController.cs
View File

@@ -42,7 +42,7 @@ public class DevicesConnectController : ControllerBase
[IgnoreTenant]
public async Task<string> ResigterAsync(DeviceResigterRequest request)
{
return await _deviceConnectService.ResigterAsync(request);
return await _deviceConnectService.RegisterAsync(request);
}
/// <summary>

6
Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
View File

@@ -65,9 +65,9 @@ public class DevicesController : ControllerBase
[Obsolete("迁移到DeviceConnect")]
[HttpPost("resigter")]
[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>
@@ -138,7 +138,7 @@ public class DevicesController : ControllerBase
[HttpPost("businessplaces")]
public async Task SetResigterBusinessPlaceAsync(DeviceSetResigterBusinessPlaceRequest request)
{
await _deviceConnectService.SetResigterBusinessPlaceAsync(request);
await _deviceConnectService.SetRegisterBusinessPlaceAsync(request);
}
/// <summary>

4
Src/Dlhis.Basic/Device/Services/IDeviceConnectService.cs
View File

@@ -10,7 +10,7 @@ public interface IDeviceConnectService : IScopeDependency
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
Task<string> ResigterAsync(DeviceResigterRequest request);
Task<string> RegisterAsync(DeviceResigterRequest request);
/// <summary>
@@ -24,7 +24,7 @@ public interface IDeviceConnectService : IScopeDependency
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
Task SetResigterBusinessPlaceAsync(DeviceSetResigterBusinessPlaceRequest request);
Task SetRegisterBusinessPlaceAsync(DeviceSetResigterBusinessPlaceRequest request);
/// <summary>
/// 设备心跳

6
Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
View File

@@ -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();
businessPlace.ThrowIfNull("营业点不存在");
@@ -32,7 +32,7 @@ public class DeviceConnectService : IDeviceConnectService
if (registry == null)
{
registry = new DeviceRegistryEntity()
registry = new DeviceRegistryEntity
{
DeviceUniqueNo = request.UniqueNo,
LastHeartbeatTime = DateTime.Now,
@@ -60,7 +60,7 @@ public class DeviceConnectService : IDeviceConnectService
return devices.Adapt<List<DeviceNotSetBusinessPlaceResponse>>();
}
public async Task SetResigterBusinessPlaceAsync(DeviceSetResigterBusinessPlaceRequest request)
public async Task SetRegisterBusinessPlaceAsync(DeviceSetResigterBusinessPlaceRequest request)
{
var device = await GetEnableDeviceAsync(request.UniqueNo);
(device.Type != DeviceTypeEnumType.Meal).ThrowIfTrue("非就餐类型设备,无法设置");

3
Src/Dlhis.Basic/Dlhis.Basic.csproj
View File

@@ -14,6 +14,9 @@
<Content Remove="log\**" />
<EmbeddedResource Remove="log\**" />
<None Remove="log\**" />
<Content Update="appsettings.Development.json">
<DependentUpon>appsettings.json</DependentUpon>
</Content>
</ItemGroup>
<ItemGroup>