diff --git a/Src/Dlhis.Basic/Device/Request/GeneratePermissionIdRequest.cs b/Src/Dlhis.Basic/Device/Request/GeneratePermissionIdRequest.cs
deleted file mode 100644
index df040d36..00000000
--- a/Src/Dlhis.Basic/Device/Request/GeneratePermissionIdRequest.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Dlhis.Basic.Device.Request
-{
- public class GeneratePermissionIdRequest
- {
- public long Id { get; set; }
- }
-}
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs
index e187df3f..5713b9f7 100644
--- a/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs
+++ b/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs
@@ -2,7 +2,6 @@
using Dlhis.Basic.Device.Request;
using Dlhis.Basic.Organization.Dto;
using Dlhis.Entity.Device.Enums;
-using Dlhis.Entity.Sys.Enums;
using Kurisu.AspNetCore.DataAccess.Dto;
namespace Dlhis.Basic.Device.Services;
diff --git a/Src/Dlhis.Entity/Sys/Enums/DeviceAssignmentTypeEnumType.cs b/Src/Dlhis.Entity/Sys/Enums/DeviceAssignmentTypeEnumType.cs
index 5302ddf8..21162d80 100644
--- a/Src/Dlhis.Entity/Sys/Enums/DeviceAssignmentTypeEnumType.cs
+++ b/Src/Dlhis.Entity/Sys/Enums/DeviceAssignmentTypeEnumType.cs
@@ -24,5 +24,5 @@ public enum DeviceAssignmentTypeEnumType
/// 营业点
///
[Description("营业点")]
- BusinessPlace = 3,
+ BusinessPlace = 3
}
diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Controllers/DeviceUploadLogsController.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Controllers/DeviceUploadLogsController.cs
index 583071d0..c7792ab7 100644
--- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Controllers/DeviceUploadLogsController.cs
+++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Controllers/DeviceUploadLogsController.cs
@@ -45,27 +45,4 @@ public class DeviceUploadLogsController : ControllerBase
{
await _deviceUploadLogService.UploadLogsAsync(requests);
}
-
- ///
- /// 设置设备获取记录开始时间
- ///
- ///
- ///
- [HttpPost("reset-begintime")]
- [Transactional]
- public async Task SetUploadLogsBeginDateTime(List requests)
- {
- await _deviceUploadLogService.SetUploadLogsBeginDateTimeAsync(requests);
- }
-
- //[HttpPost("try")]
- //public async Task Test()
- //{
- // var dtoResult = await _devicePermissionApi.GetPermissionUsersInfoAsync();
- // var dto = dtoResult.Data;
- // var rResult = await _devicePermissionApi.RePermissionUsersInfoAsync(dto);
- // var r = rResult.Data;
-
- // return r;
- //}
}
diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/IDeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/IDeviceUploadLogService.cs
index 1eceeb42..7d8310e2 100644
--- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/IDeviceUploadLogService.cs
+++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/IDeviceUploadLogService.cs
@@ -9,6 +9,4 @@ public interface IDeviceUploadLogService : IScopeDependency
Task> GetPageAsync(DeviceUploadLogPageRequest request);
Task UploadLogsAsync(List requests);
-
- Task SetUploadLogsBeginDateTimeAsync(List requests);
}
diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
index aef1a533..071f53c4 100644
--- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
+++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
@@ -15,12 +15,10 @@ namespace Dlhis.ScheduledTask.DeviceUploadLog.Services.Implements;
public class DeviceUploadLogService : IDeviceUploadLogService
{
private readonly IDbContext _dbContext;
- private readonly ILogger _logger;
- public DeviceUploadLogService(IDbContext dbContext, ILogger logger)
+ public DeviceUploadLogService(IDbContext dbContext)
{
_dbContext = dbContext;
- _logger = logger;
}
public async Task> GetPageAsync(DeviceUploadLogPageRequest request)
@@ -29,13 +27,13 @@ public class DeviceUploadLogService : IDeviceUploadLogService
{
DeviceTypeEnumType.Attendance => DeviceUploadLogTypeEnumType.Attendance,
DeviceTypeEnumType.Door => DeviceUploadLogTypeEnumType.Door,
- _ => null
+ _ => throw new UserFriendlyException("不支持当前设备类型")
};
return await _dbContext.Queryable()
.LeftJoin((deviceUp, device) => deviceUp.DeviceUniqueNo == device.UniqueNo)
.LeftJoin((deviceUp, device, ga) => deviceUp.UserUniqueNo == ga.Code)
- .WhereIF(type.HasValue, (deviceUp, device) => deviceUp.Type == type)
+ .Where((deviceUp, device) => deviceUp.Type == type)
.WhereIF(request.Sync.HasValue, deviceUp => deviceUp.Sync == request.Sync)
.WhereIF(request.SearchDateTimePeriod.HasValue(), deviceUp => deviceUp.RaiseDateTime >= request.SearchDateTimePeriod.Start && deviceUp.RaiseDateTime <= request.SearchDateTimePeriod.End)
.WhereIF(request.IsOutSource.HasValue && request.IsOutSource.Value, deviceUp => SqlFunc.Subqueryable().Where(x => x.Code == deviceUp.UserUniqueNo).Any())
@@ -100,26 +98,4 @@ public class DeviceUploadLogService : IDeviceUploadLogService
await _dbContext.InsertAsync(inserts);
}
-
- public async Task SetUploadLogsBeginDateTimeAsync(List requests)
- {
- var uniqueNos = requests.DistinctBy(x => x.DeviceUniqueNo).Select(x => x.DeviceUniqueNo).ToList();
- var devices = await _dbContext.Queryable()
- .Where(x => uniqueNos.Contains(x.UniqueNo))
- .Where(x => x.Type == DeviceTypeEnumType.Attendance || x.Type == DeviceTypeEnumType.Door)
- .ToListAsync();
-
- (uniqueNos.Count != devices.Count).ThrowIfTrue("存在非考勤和门禁的设备");
-
- var tenantId = devices.FirstOrDefault().TenantId;
- var logs = requests.Select(request => new DeviceUploadLogEntity
- {
- DeviceUniqueNo = request.DeviceUniqueNo,
- Type = DeviceUploadLogTypeEnumType.Raise,
- RaiseDateTime = request.Begin,
- TenantId = tenantId
- }).ToList();
-
- await _dbContext.InsertAsync(logs);
- }
}
\ No newline at end of file