From bd91787e92bc11cb604dbf89ed90b21e29eab296 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 13 Jun 2024 14:49:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=8E=B7=E5=8F=96=E5=93=81=E7=89=8C?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=A2=9E=E5=8A=A0factory=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/DevicesConnectController.cs   |  7 +++--
 .../Device/Controllers/DevicesController.cs   | 28 ++++++++++---------
 .../Device/Services/IDeviceConnectService.cs  |  3 +-
 .../Implements/DeviceConnectService.cs        |  8 +++---
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicesConnectController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicesConnectController.cs
index e2b3bfe0..d81ed9fa 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicesConnectController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicesConnectController.cs
@@ -72,10 +72,13 @@ public class DevicesConnectController : ControllerBase
     /// 获取品牌设备
     /// </summary>
     /// <param name="brand"></param>
+    /// <param name="factory"></param>
     /// <returns></returns>
     [HttpGet("brand-devices")]
-    public async Task<List<DeviceUniqueWithConnectionInfoDto>> GetDeviceUniqueInfoByBrandAsync([Required(ErrorMessage = "请明确设备品牌")] string brand)
+    public async Task<List<DeviceUniqueWithConnectionInfoDto>> GetDeviceUniqueInfoByBrandAsync(
+        [Required(ErrorMessage = "请明确设备品牌")] string brand,
+        [Required(ErrorMessage = "请明确厂区")] string factory)
     {
-        return await _deviceConnectService.GetDeviceUniqueInfoByBrandAsync(brand);
+        return await _deviceConnectService.GetDeviceUniqueInfoByBrandAsync(brand, factory);
     }
 }
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
index 40d4229d..598dbac2 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
@@ -37,11 +37,24 @@ public class DevicesController : ControllerBase
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
+    [Authorize(Roles = "admin")]
     [HttpGet("template/page")]
     public async Task<Pagination<DeviceTemplateResponse>> GetTemplatePageAsync([FromQuery] DeviceTemplatePageRequest request)
     {
         return await _deviceTemplateService.GetPageAsync(request);
     }
+    
+    /// <summary>
+    /// 设备模板保存
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [Authorize(Roles = "admin")]
+    [HttpPost("template")]
+    public async Task SaveTemplateAsync(DeviceTemplateSaveRequest request)
+    {
+        await _deviceTemplateService.SaveTemplateAsync(request);
+    }
 
 
     /// <summary>
@@ -70,17 +83,6 @@ public class DevicesController : ControllerBase
         return await _deviceConnectService.RegisterAsync(request);
     }
 
-    /// <summary>
-    /// 设备模板保存
-    /// </summary>
-    /// <param name="request"></param>
-    /// <returns></returns>
-    [Authorize(Roles = "admin")]
-    [HttpPost("template")]
-    public async Task SaveTemplateAsync(DeviceTemplateSaveRequest request)
-    {
-        await _deviceTemplateService.SaveTemplateAsync(request);
-    }
 
     /// <summary>
     /// 设备分页
@@ -219,6 +221,6 @@ public class DevicesController : ControllerBase
     [HttpPost("import")]
     public async Task Import(List<DeviceImportRequest> request)
     {
-         await _deviceService.ImportAsync(request);
+        await _deviceService.ImportAsync(request);
     }
-}
+}
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Device/Services/IDeviceConnectService.cs b/Src/Dlhis.Basic/Device/Services/IDeviceConnectService.cs
index 9e3304bc..fed6c305 100644
--- a/Src/Dlhis.Basic/Device/Services/IDeviceConnectService.cs
+++ b/Src/Dlhis.Basic/Device/Services/IDeviceConnectService.cs
@@ -51,6 +51,7 @@ public interface IDeviceConnectService : IScopeDependency
     /// 根据品牌获取设备信息
     /// </summary>
     /// <param name="brand"></param>
+    /// <param name="factory"></param>
     /// <returns></returns>
-    Task<List<DeviceUniqueWithConnectionInfoDto>> GetDeviceUniqueInfoByBrandAsync(string brand);
+    Task<List<DeviceUniqueWithConnectionInfoDto>> GetDeviceUniqueInfoByBrandAsync(string brand, string factory);
 }
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
index ba73cb91..629294ea 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
@@ -123,12 +123,12 @@ public class DeviceConnectService : IDeviceConnectService
             })
             .ToListAsync();
     }
-    
-    public async Task<List<DeviceUniqueWithConnectionInfoDto>> GetDeviceUniqueInfoByBrandAsync(string brand)
+
+    public async Task<List<DeviceUniqueWithConnectionInfoDto>> GetDeviceUniqueInfoByBrandAsync(string brand, string factory)
     {
         return await _dbContext.Queryable<DeviceEntity>()
             .LeftJoin<DeviceTemplateEntity>((d, dt) => d.TemplateCode == dt.Code)
-            .Where((d, dt) => dt.Brand == brand)
+            .Where((d, dt) => dt.Brand == brand && d.TenantId == factory)
             .Select(d => new DeviceUniqueWithConnectionInfoDto
             {
                 DeviceUnique = d.UniqueNo,
@@ -176,7 +176,7 @@ public class DeviceConnectService : IDeviceConnectService
                     Funcs = new List<DeviceFuncEnumType>(),
                     Type = DeviceTypeEnumType.Meal,
                     DeployPlace = deployPlace,
-                    HeartbeatInterval = 30,
+                    HeartbeatInterval = 0,
                     DeployDirection = null,
                     Enable = true,
                     AsAttendance = false,