From 3fa486cfb4cf9b36e5f6ed23cd52876920e4027a Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 3 Jul 2024 16:18:57 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3,=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0tenant-admin=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GetDataPermissionService.cs               |  3 +-
 .../Device/Controllers/DevicesController.cs   | 23 +--------
 .../Device/Services/IDeviceService.cs         |  4 --
 .../Services/Implements/DeviceService.cs      | 47 +------------------
 4 files changed, 4 insertions(+), 73 deletions(-)

diff --git a/Src/Dlhis.Basic/DataPermissions/GetDataPermissionService.cs b/Src/Dlhis.Basic/DataPermissions/GetDataPermissionService.cs
index aaf73b23..531db40d 100644
--- a/Src/Dlhis.Basic/DataPermissions/GetDataPermissionService.cs
+++ b/Src/Dlhis.Basic/DataPermissions/GetDataPermissionService.cs
@@ -23,7 +23,8 @@ public class GetDataPermissionService : IGetDataPermissions, ISingletonDependenc
     public Dictionary<string, List<Guid>> GetData<T>()
     {
         var dict = new Dictionary<string, List<Guid>>(2);
-        if (_currentUser.GetRole() == "admin")
+        var currentRole = _currentUser.GetRole();
+        if (currentRole is "admin" or "tenant-admin")
         {
             return dict;
         }
diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
index 4801b8d9..ea5ca7ac 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
@@ -82,8 +82,7 @@ public class DevicesController : ControllerBase
     {
         return await _deviceConnectService.RegisterAsync(request);
     }
-
-
+    
     /// <summary>
     /// 设备分页
     /// </summary>
@@ -174,16 +173,6 @@ public class DevicesController : ControllerBase
         return await _deviceService.GetDeviceNumberAsync();
     }
 
-    /// <summary>
-    /// 获取考勤设备详情列表
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet("attendancestotal")]
-    public async Task<Pagination<DevicePageResponse>> GetAttendanceTotalAsync([FromQuery] AttendanceTotalRequest request)
-    {
-        return await _deviceService.GetAttendanceTotalAsync(request);
-    }
-
     /// <summary>
     /// 获取考勤在线/离线设备详情列表
     /// </summary>
@@ -194,16 +183,6 @@ public class DevicesController : ControllerBase
         return await _deviceService.GetOnlineStatusPageAsync(request);
     }
 
-    /// <summary>
-    /// 获取近期30天考勤新增设备数
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet("recentnumbers")]
-    public async Task<List<RecentNumberResponse>> GetRecentNumbersAsync()
-    {
-        return await _deviceService.GetRecentNumbersAsync();
-    }
-
     /// <summary>
     /// 批量导入设备信息
     /// </summary>
diff --git a/Src/Dlhis.Basic/Device/Services/IDeviceService.cs b/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
index d941645d..8ebcb7f3 100644
--- a/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
@@ -16,12 +16,8 @@ public interface IDeviceService : IScopeDependency
 
     Task<DeviceNumberResponse> GetDeviceNumberAsync();
 
-    Task<Pagination<DevicePageResponse>> GetAttendanceTotalAsync(AttendanceTotalRequest request);
-
     Task<Pagination<DevicePageResponse>> GetOnlineStatusPageAsync(DeviceOnlineAndOfflineRequest request);
 
-    Task<List<RecentNumberResponse>> GetRecentNumbersAsync();
-
     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 ba7201c9..9c34262a 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
@@ -341,58 +341,13 @@ public class DeviceService : IDeviceService
         var list = devices.Where(x => offUniqueNos.Contains(x.UniqueNo)).ToList();
         return list;
     }
-
-
-    public async Task<Pagination<DevicePageResponse>> GetAttendanceTotalAsync(AttendanceTotalRequest request)
-    {
-        var page = await _dbContext.Queryable<DeviceEntity>()
-            .LeftJoin<DeviceTemplateEntity>((d, dt) => d.TemplateCode == dt.Code)
-            .Where(d => d.Type == DeviceTypeEnumType.Attendance || (d.Type == DeviceTypeEnumType.Door && d.AsAttendance))
-            .Select((d, dt) => new DevicePageResponse
-            {
-                FuncsStr = d.Funcs.ToString(),
-                Brand = dt.Brand,
-                Type = d.Type,
-            }, true)
-            .ToPageListAsync(request);
-
-        return page;
-    }
+    
 
     public async Task<Pagination<DevicePageResponse>> GetOnlineStatusPageAsync(DeviceOnlineAndOfflineRequest request)
     {
         return await GetDeviceStatusPageAsync(request.IsOnline, request, request.Type);
     }
 
-    public async Task<List<RecentNumberResponse>> GetRecentNumbersAsync()
-    {
-        //获取近30天并转化为"yyyy-MM-dd"集合
-        DateTime currentDate = DateTime.Now;
-        var times = new List<string>();
-        for (int i = 0; i < 30; i++)
-        {
-            DateTime date = currentDate.AddDays(-i);
-            string dateString = date.ToString("yyyy-MM-dd");
-            times.Add(dateString);
-        }
-
-        var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => x.Type == DeviceTypeEnumType.Attendance || (x.Type == DeviceTypeEnumType.Door && x.AsAttendance)).ToListAsync();
-
-        var list = new List<RecentNumberResponse>();
-        times.ForEach(time =>
-        {
-            var count = devices.Count(x => x.CreateTime.ToString("yyyy-MM-dd") == time);
-            var res = new RecentNumberResponse
-            {
-                Date = time,
-                Num = count,
-            };
-            list.Add(res);
-        });
-
-        return list;
-    }
-
     //************************************************************* help methods ************************************************************************
 
     private async Task<Pagination<DevicePageResponse>> GetDeviceStatusPageAsync(bool isOnline, PageDto pageDto, DeviceTypeEnumType type)