fix datapermission crosstenant

Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs

@@ -106,8 +106,8 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
 
                 entity.ShiftCode = shift.Code;
                 entity.ShiftCustomCode = shift.CustomCode;
-                entity.Start = request.TimePeriod.Start!.Value;
+                entity.Start = request.TimePeriod.Start;
-                entity.End = request.TimePeriod.End!.Value;
+                entity.End = request.TimePeriod.End;
 
                 await _dbContext.InsertAsync(entity);
             }
@@ -119,8 +119,8 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
 
                 entity.ThrowIfNull("餐次段不存在");
 
-                entity.Start = request.TimePeriod.Start!.Value;
+                entity.Start = request.TimePeriod.Start;
-                entity.End = request.TimePeriod.End!.Value;
+                entity.End = request.TimePeriod.End;
 
                 request.Adapt(entity);
                 await _dbContext.UpdateAsync(entity);

Src/Dlhis.Basic/Device/Controllers/DeviceGroupsController.cs

@@ -69,7 +69,7 @@ public class DeviceGroupsController : ControllerBase
     /// <returns></returns>
     [HttpPost("assign")]
     [Transactional]
-    [DataPermission]
+    [CrossTenant]
     public async Task AssignDevicesAsync(DeviceAssignRequest request)
     {
         await _deviceGroupService.AssignDevicesAsync(request);

Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs

@@ -30,7 +30,7 @@ public class DevicePermissionsController : ControllerBase
     [HttpPost("assign")]
     [AssignPermissionLimit]
     [Transactional]
-    [DataPermission]
+    [CrossTenant]
     public async Task AssignAsync(DevicePermissionSaveRequest request)
     {
         await _devicePermissionService.AssignAsync(request);
@@ -43,7 +43,7 @@ public class DevicePermissionsController : ControllerBase
     [HttpPost("assign-unique")]
     [AssignPermissionLimit]
     [Transactional]
-    [DataPermission]
+    [CrossTenant]
     public async Task AssignToUniqueAsync(DevicePermissionsAssignToDeviceRequest request)
     {
         await _devicePermissionService.AssignToUniqueAsync(request);
@@ -54,8 +54,8 @@ public class DevicePermissionsController : ControllerBase
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
-    [DataPermission(ignoreTenant: true, includeCustom: true)]
     [HttpGet("assignments")]
+    [CrossTenant]
     public async Task<List<Guid>> GetAssignmentsAsync([FromQuery] DeviceGetAssignmentsRequest request)
     {
         return await _devicePermissionService.GetAssignmentsAsync(request);

Src/Dlhis.Basic/Device/Controllers/DevicesConnectController.cs

@@ -3,6 +3,7 @@ using Dlhis.Basic.Device.Dtos;
 using Dlhis.Basic.Device.Request;
 using Dlhis.Basic.Device.Services;
 using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
+using Kurisu.AspNetCore.UnifyResultAndValidation.Aop;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -28,6 +29,7 @@ public class DevicesConnectController : ControllerBase
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
+    [DisableApiLog]
     [HttpPost("heartbeat")]
     [IgnoreTenant]
     public async Task HeartbeatAsync(DeviceHeartbeatRequest request)

Src/Dlhis.Basic/Device/Controllers/DevicesController.cs

@@ -45,7 +45,6 @@ public class DevicesController : ControllerBase
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
-    [Authorize(Roles = "admin")]
     [HttpPost("template")]
     public async Task SaveTemplateAsync(DeviceTemplateSaveRequest request)
     {
@@ -85,7 +84,7 @@ public class DevicesController : ControllerBase
     /// <param name="request"></param>
     /// <returns></returns>
     [HttpGet("page")]
-    [DataPermission(ignoreTenant: true, includeCustom: true)]
+    [DataPermission]
     public async Task<Pagination<DevicePageResponse>> GetPageAsync([FromQuery] DevicePageRequest request)
     {
         return await _deviceService.GetPageAsync(request);
@@ -125,26 +124,6 @@ public class DevicesController : ControllerBase
         await _deviceConnectService.SetRegisterBusinessPlaceAsync(request);
     }
 
-    /// <summary>
-    /// 检查设备是否存在
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet("exists")]
-    public async Task<bool> CheckExistsAsync(string deviceUniqueNo)
-    {
-        return await _deviceService.CheckExistsAsync(deviceUniqueNo);
-    }
-
-    /// <summary>
-    /// 获取考勤设备
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet("attendances")]
-    public async Task<List<DeviceResponse>> GetAttendanceDevicesAsync()
-    {
-        return await _deviceService.GetAttendanceDevicesAsync();
-    }
-
     /// <summary>
     /// 获取考勤在线/离线设备详情列表
     /// </summary>

Src/Dlhis.Basic/Device/Services/IDeviceService.cs

@@ -10,10 +10,6 @@ public interface IDeviceService : IScopeDependency
 
     Task SaveAsync(DeviceSaveRequest request);
 
-    Task<bool> CheckExistsAsync(string deviceUniqueNo);
-
-    Task<List<DeviceResponse>> GetAttendanceDevicesAsync();
-
     Task<Pagination<DevicePageResponse>> GetOnlineStatusPageAsync(DeviceOnlineAndOfflineRequest request);
 
     Task ImportAsync(List<DeviceImportRequest> request);

Src/Dlhis.Basic/Device/Services/Implements/DeviceGroupService.cs

@@ -98,7 +98,7 @@ public class DeviceGroupService : IDeviceGroupService
 
     public async Task AssignDevicesAsync(DeviceAssignRequest request)
     {
-        var group = await _dbContext.Queryable<DeviceGroupEntity>().Where(x => x.Code == request.GroupCode).FirstAsync();
+        var group = await _dbContext.Queryable<DeviceGroupEntity>().Where(x => x.Code == request.GroupCode).SingleAsync();
         group.ThrowIfNull("设备分组不存在,无法进行分配");
 
         await CheckNoNextGroupAsync(group.Code);

Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs

@@ -34,13 +34,10 @@ public class DeviceService : IDeviceService
 
     public async Task<Pagination<DevicePageResponse>> GetPageAsync(DevicePageRequest request)
     {
-        var tenantId = _currentUser.GetStringTenantId();
-
         var page = await _dbContext.Queryable<DeviceEntity>()
             .LeftJoin<DeviceTemplateEntity>((d, dt) => d.TemplateCode == dt.Code)
             .LeftJoin<DeviceRegistryEntity>((d, dt, dr) => d.UniqueNo == dr.DeviceUniqueNo)
             .LeftJoin<BusinessPlaceEntity>((d, dt, dr, bp) => dr.BusinessPlaceCode == bp.Code)
-            .Where(d => tenantId == d.TenantId)
             .Where((d, dt) => d.Type == request.Type)
             .WhereIF(request.Enable.HasValue, (d, dt) => d.Enable == request.Enable)
             .WhereIF(request.Search.IsPresent(), d => d.UniqueNo == request.Search || d.DeployPlace.Contains(request.Search))
@@ -232,71 +229,37 @@ public class DeviceService : IDeviceService
     /// <returns></returns>
     private async Task CheckUniqueNoExistsAsync(DeviceSaveRequest request)
     {
-        var currentTenantId = _currentUser.GetStringTenantId();
+        await _dbContext.IgnoreAsync<ITenantId>(async () =>
-        _dbContext.Client.QueryFilter.ClearAndBackup<ITenantId>();
+         {
-        try
+             var currentTenantId = _currentUser.GetStringTenantId();
-        {
-            //查询设备是否存在
-            var device = await _dbContext.Queryable<DeviceEntity>()
-                .Where(x => x.UniqueNo == request.UniqueNo)
-                .WhereIF(request.Id.HasValue, x => x.Id != request.Id)
-                .FirstAsync();
 
-            if (device != null)
+             //查询设备是否存在
-            {
+             var device = await _dbContext.Queryable<DeviceEntity>()
-                (device.TenantId == currentTenantId).ThrowIfTrue("设备已经存在,请检查");
+                 .Where(x => x.UniqueNo == request.UniqueNo)
+                 .WhereIF(request.Id.HasValue, x => x.Id != request.Id)
+                 .SingleAsync();
 
-                var factory = device.TenantId;
+             if (device != null)
-                try
+             {
-                {
+                 (device.TenantId == currentTenantId).ThrowIfTrue("设备已经存在,请检查");
-                    var tenantResult = await _tenantApi.GetTenantByCodeAsync(device.TenantId);
-                    factory = tenantResult?.Data?.Name ?? string.Empty;
-                }
-                catch (Exception)
-                {
-                    //ignore
-                }
 
-                true.ThrowIfTrue($"设备已添加{factory}厂区");
+                 var factory = device.TenantId;
-            }
+                 try
-        }
+                 {
-        finally
+                     var tenantResult = await _tenantApi.GetTenantByCodeAsync(device.TenantId);
-        {
+                     factory = tenantResult?.Data?.Name ?? string.Empty;
-            _dbContext.Client.QueryFilter.Restore();
+                 }
-        }
+                 catch (Exception)
+                 {
+                     //ignore
+                 }
+
+                 true.ThrowIfTrue($"设备已添加{factory}厂区");
+             }
+         });
     }
     
 
-    public async Task<bool> CheckExistsAsync(string deviceUniqueNo)
-    {
-        _dbContext.Client.QueryFilter.ClearAndBackup<ITenantId>();
-        try
-        {
-            return await _dbContext.Queryable<DeviceEntity>()
-                .Where(x => x.UniqueNo == deviceUniqueNo && x.Enable)
-                .AnyAsync();
-        }
-        finally
-        {
-            _dbContext.Client.QueryFilter.Restore();
-        }
-    }
-
-
-    public async Task<List<DeviceResponse>> GetAttendanceDevicesAsync()
-    {
-        var devices = await _dbContext.Queryable<DeviceEntity>()
-            .Where(x => x.Enable)
-            .Where(x => x.Type == DeviceTypeEnumType.Attendance || (x.Type == DeviceTypeEnumType.Door && x.AsAttendance))
-            .Select(x => new DeviceResponse
-            {
-                FuncsStr = x.Funcs.ToString()
-            }, true)
-            .ToListAsync();
-
-        return devices.Where(x => x.Type == DeviceTypeEnumType.Attendance).ToList();
-    }
-
     /// <summary>
     /// 获取离线设备
     /// </summary>

Src/Dlhis.Basic/Organization/Controllers/GainfoGroupsController.cs

@@ -64,7 +64,7 @@ public class GainfoGroupsController : ControllerBase
     [HttpPost("assign")]
     [AssignPermissionLimit]
     [Transactional]
-    [DataPermission]
+    [CrossTenant]
     public async Task AssignGainfosAsync(GainfoAssignRequest request)
     {
         await _gainfoGroupService.AssignGainfosAsync(request);

Src/Dlhis.Basic/Organization/Controllers/GainfoOutsourceSettingController.cs

@@ -30,7 +30,7 @@ public class GainfoOutsourceSettingController : ControllerBase
     [HttpPost("save")]
     [AssignPermissionLimit]
     [Transactional]
-    [DataPermission]
+    [CrossTenant]
     public async Task SaveAsync(GainfoOutsourceSettingSaveRequest request)
     {
         await _gainfoOutSourceService.SaveAsync(request);

Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs

@@ -125,7 +125,8 @@ public class BusinessPlacesController : ControllerBase
     /// <returns></returns>
     [HttpPost("device/assign")]
     [AssignPermissionLimit]
-    [DataPermission]
+    [Transactional]
+    [CrossTenant]
     public async Task Assign(DispositionDeviceRequest request)
     {
         await _businessPlaceShiftService.AssignAsync(request);

Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs

@@ -196,7 +196,7 @@ public class OrderService : BaseOrderService, IOrderService
         {
             Start = x.Start,
             End = x.End
-        }.IsPresent1(request.CostDateTime));
+        }.IsPresent(request.CostDateTime));
 
         var costDate = await GetCostDateAsync(shift, request.CostDateTime);
 
@@ -323,7 +323,7 @@ public class OrderService : BaseOrderService, IOrderService
         {
             Start = x.Start,
             End = x.End
-        }.IsPresent1(request.CostDateTime));
+        }.IsPresent(request.CostDateTime));
         shift.ThrowIfNull("非就餐时间,无法消费");
 
         _logs.Add("检验设备和营业点参数:" + _sw.ElapsedMilliseconds);

Src/Dlhis.Canteen/Order/TimePeriodExtensions.cs

@@ -1,42 +0,0 @@
-using Kurisu.AspNetCore.CustomClass;
-
-namespace Dlhis.Canteen.Order;
-
-
-/// <summary>
-/// 临时的扩展类  todo: 嵌入框架
-/// </summary>
-public static class TimePeriodExtensions
-{
-    public static bool IsPresent1(this TimePeriod period, DateTime dateTime)
-    {
-        DateTime start;
-        DateTime end;
-
-        if (period.IsCrossDay())
-        {
-            //period = [22:00:00,03:00:00]
-            var currentStart = dateTime.Date.Add(period.Start.Value.ToTimeSpan());
-            var endOfDay = dateTime.Date.AddDays(1).AddSeconds(-1);
-
-            //assume is left range . then currentStart is 2024-04-16 22:00:00 and endOfDay is 2024-04-16 23:59:59
-            if (dateTime >= currentStart && dateTime <= endOfDay)
-            {
-                start = currentStart; //2024-04-16 22:00:00
-                end = dateTime.Date.AddDays(1).Add(period.End.Value.ToTimeSpan());//2024-04-17 03:00:00
-            }
-            else
-            {
-                start = dateTime.Date.AddDays(-1).Add(period.Start.Value.ToTimeSpan());
-                end = dateTime.Date.Add(period.End.Value.ToTimeSpan());
-            }
-        }
-        else
-        {
-            start = dateTime.Date.Add(period.Start.Value.ToTimeSpan());
-            end = dateTime.Date.Add(period.End.Value.ToTimeSpan());
-        }
-
-        return dateTime >= start && dateTime <= end;
-    }
-}

Src/Dlhis.Common/ApiLog/Controller/ApiLogController.cs

@@ -2,6 +2,7 @@
 using Dlhis.Common.ApiLog.Response;
 using Dlhis.Common.ApiLog.Services.Implements;
 using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.UnifyResultAndValidation.Aop;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -26,7 +27,7 @@ public class ApiLogController : ControllerBase
     /// 获取api日志
     /// </summary>
     /// <returns></returns>
-    [Authorize(Roles = "admin")]
+    [DisableApiLog]
     [HttpGet("logs")]
     public async Task<Pagination<ApiLogResponse>> GetLogsAsync([FromQuery] ApiLogRequest request)
     {

Src/Dlhis.Common/EnumSetting/EnumsController.cs

@@ -3,6 +3,7 @@ using Dlhis.Common.FileOperation.Response;
 using Dlhis.Entity.Basic.Entity;
 using Kurisu.AspNetCore.CustomClass;
 using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
+using Kurisu.AspNetCore.UnifyResultAndValidation.Aop;
 using Kurisu.AspNetCore.Utils.Extensions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -29,6 +30,7 @@ public class EnumsController : ControllerBase
     /// </summary>
     /// <param name="code">code</param>
     /// <returns></returns>
+    [DisableApiLog]
     [HttpGet]
     public List<CommonEnumResponse> GetEnums(string code)
     {

Src/Dlhis.Entity/Dlhis.Entity.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Kurisu.AspNetCore" Version="0.9.23" />
+    <PackageReference Include="Kurisu.AspNetCore" Version="0.9.24" />
   </ItemGroup>
 
 </Project>

Src/Dlhis.Middle/Services/Implements/OrderService.cs

@@ -146,7 +146,7 @@ public class OrderService : IOrderService
         {
             Start = TimeOnly.FromDateTime(x.Start),
             End = TimeOnly.FromDateTime(x.End)
-        }.IsPresent1(request.CostDateTime));
+        }.IsPresent(request.CostDateTime));
         shift.ThrowIfNull("非就餐时间,无法消费");
 
         var costDate = await GetCostDateAsync(shift, request.CostDateTime);

Src/Dlhis.Middle/TimePeriodExtensions.cs

@@ -1,42 +0,0 @@
-using Kurisu.AspNetCore.CustomClass;
-
-namespace Dlhis.Middle;
-
-
-/// <summary>
-/// 临时的扩展类  todo: 嵌入框架
-/// </summary>
-public static class TimePeriodExtensions
-{
-    public static bool IsPresent1(this TimePeriod period, DateTime dateTime)
-    {
-        DateTime start;
-        DateTime end;
-
-        if (period.IsCrossDay())
-        {
-            //period = [22:00:00,03:00:00]
-            var currentStart = dateTime.Date.Add(period.Start.Value.ToTimeSpan());
-            var endOfDay = dateTime.Date.AddDays(1).AddSeconds(-1);
-
-            //assume is left range . then currentStart is 2024-04-16 22:00:00 and endOfDay is 2024-04-16 23:59:59
-            if (dateTime >= currentStart && dateTime <= endOfDay)
-            {
-                start = currentStart; //2024-04-16 22:00:00
-                end = dateTime.Date.AddDays(1).Add(period.End.Value.ToTimeSpan());//2024-04-17 03:00:00
-            }
-            else
-            {
-                start = dateTime.Date.AddDays(-1).Add(period.Start.Value.ToTimeSpan());
-                end = dateTime.Date.Add(period.End.Value.ToTimeSpan());
-            }
-        }
-        else
-        {
-            start = dateTime.Date.Add(period.Start.Value.ToTimeSpan());
-            end = dateTime.Date.Add(period.End.Value.ToTimeSpan());
-        }
-
-        return dateTime >= start && dateTime <= end;
-    }
-}

Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/AssignmentsController.cs

@@ -2,6 +2,7 @@
 using Dlhis.ScheduledTask.TaskAssignment.Response;
 using Dlhis.ScheduledTask.TaskAssignment.Services;
 using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
+using Kurisu.AspNetCore.UnifyResultAndValidation.Aop;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -26,6 +27,7 @@ public class AssignmentsController : ControllerBase
     /// 获取设备任务(按设备)
     /// </summary>
     /// <returns></returns>
+    [DisableApiLog]
     [IgnoreTenant]
     [HttpGet("deviceTasks")]
     public async Task<List<DeviceTaskToDeviceByDeviceResponse>> DeviceGetTasksGetAsync([FromQuery] DeviceTaskGetRequest request)
@@ -37,6 +39,7 @@ public class AssignmentsController : ControllerBase
     /// 获取设备任务(按设备)
     /// </summary>
     /// <returns></returns>
+    [DisableApiLog]
     [HttpPost("deviceTasks")]
     [IgnoreTenant]
     public async Task<List<DeviceTaskToDeviceByDeviceResponse>> DeviceGetTasksPostAsync(DeviceTaskGetRequest request)
@@ -49,7 +52,8 @@ public class AssignmentsController : ControllerBase
     /// </summary>
     /// <param name="requests"></param>
     /// <returns></returns>
-    [HttpPost("taskstatus")]
+    [DisableApiLog]
+    [HttpPost("taskStatus")]
     [IgnoreTenant]
     public async Task UpdateDeviceTaskStatusAsync(List<UpdateDeviceTaskStatusRequest> requests)
     {

Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/DeviceTaskAssignmentsController.cs

@@ -28,8 +28,8 @@ public class DeviceTaskAssignmentsController : ControllerBase
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
-    [DataPermission]
     [HttpGet("page")]
+    [CrossTenant]
     public async Task<Pagination<DeviceTaskAssignmentResponse>> GetPageAsync([FromQuery] DeviceTaskAssignmentRequest request)
     {
         return await _deviceTaskAssignmentService.GetPageAsync(request);