From 9f54fc101d287054e53f786650c20e1979cdfe20 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Fri, 5 Jul 2024 15:56:12 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=A7=BB=E9=99=A4=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD,api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/DevicePermissionsController.cs    |  1 -
 .../Device/Controllers/DevicesController.cs       | 10 ----------
 Src/Dlhis.Basic/Device/Services/IDeviceService.cs |  2 --
 .../Device/Services/Implements/DeviceService.cs   | 15 ---------------
 4 files changed, 28 deletions(-)

diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
index cc43cffe..ace04a7c 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
@@ -66,7 +66,6 @@ public class DevicePermissionsController : ControllerBase
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
-    [DataPermission]
     [HttpGet("assignments-unique")]
     public async Task<List<GainfoDto>> GetAssignmentUniqueAsync([FromQuery] DeviceGetAssignmentUniquesRequest request)
     {
diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
index ebb7f35d..55b92463 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
@@ -163,16 +163,6 @@ public class DevicesController : ControllerBase
         return await _deviceService.GetAttendanceDevicesAsync();
     }
 
-    /// <summary>
-    /// 获取考勤设备在线、离线及总数
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet("devicesnumbers")]
-    public async Task<DeviceNumberResponse> GetDeviceNumberAsync()
-    {
-        return await _deviceService.GetDeviceNumberAsync();
-    }
-
     /// <summary>
     /// 获取考勤在线/离线设备详情列表
     /// </summary>
diff --git a/Src/Dlhis.Basic/Device/Services/IDeviceService.cs b/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
index 8ebcb7f3..e0c950e1 100644
--- a/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
@@ -14,8 +14,6 @@ public interface IDeviceService : IScopeDependency
 
     Task<List<DeviceResponse>> GetAttendanceDevicesAsync();
 
-    Task<DeviceNumberResponse> GetDeviceNumberAsync();
-
     Task<Pagination<DevicePageResponse>> GetOnlineStatusPageAsync(DeviceOnlineAndOfflineRequest request);
 
     Task ImportAsync(List<DeviceImportRequest> request);
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
index ab1db519..52e6fbc9 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
@@ -288,21 +288,6 @@ public class DeviceService : IDeviceService
         return devices.Where(x => x.Type == DeviceTypeEnumType.Attendance).ToList();
     }
 
-    public async Task<DeviceNumberResponse> GetDeviceNumberAsync()
-    {
-        var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => x.Type == DeviceTypeEnumType.Attendance || (x.Type == DeviceTypeEnumType.Door && x.AsAttendance)).ToListAsync();
-
-        var offlineNumber = await GetOfflineDevicesCount(devices);
-
-        var res = new DeviceNumberResponse
-        {
-            OfflineNumber = offlineNumber.Count,
-            TotalNumber = devices.Count,
-            OnlineNumber = devices.Count - offlineNumber.Count
-        };
-        return res;
-    }
-
     /// <summary>
     /// 获取离线设备
     /// </summary>