From aaf43f754040842193a59036035b7531217cdd28 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Tue, 7 May 2024 12:54:39 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=91=BD=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Device/Controllers/DevicesConnectController.cs          | 2 +-
 Src/Dlhis.Basic/Device/Controllers/DevicesController.cs     | 6 +++---
 Src/Dlhis.Basic/Device/Services/IDeviceConnectService.cs    | 4 ++--
 .../Device/Services/Implements/DeviceConnectService.cs      | 6 +++---
 Src/Dlhis.Basic/Dlhis.Basic.csproj                          | 3 +++
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicesConnectController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicesConnectController.cs
index bd0cf881..ba0c2773 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicesConnectController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicesConnectController.cs
@@ -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>
diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
index 11e3f0f2..a9dd8bc9 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
@@ -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>
diff --git a/Src/Dlhis.Basic/Device/Services/IDeviceConnectService.cs b/Src/Dlhis.Basic/Device/Services/IDeviceConnectService.cs
index bf3045e1..a7ef65a8 100644
--- a/Src/Dlhis.Basic/Device/Services/IDeviceConnectService.cs
+++ b/Src/Dlhis.Basic/Device/Services/IDeviceConnectService.cs
@@ -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>
     /// 设备心跳
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
index d735172e..cf295760 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
@@ -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("非就餐类型设备,无法设置");
diff --git a/Src/Dlhis.Basic/Dlhis.Basic.csproj b/Src/Dlhis.Basic/Dlhis.Basic.csproj
index 401adcbf..eb05152d 100644
--- a/Src/Dlhis.Basic/Dlhis.Basic.csproj
+++ b/Src/Dlhis.Basic/Dlhis.Basic.csproj
@@ -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>