yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 任务来源

Browse Source
This commit is contained in:
liguoyang
2024-08-03 11:11:06 +08:00
parent 32987e45cb
commit 02acb878dc
15 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs
View File

@@ -46,8 +46,9 @@ public interface IDevicePermissionService : IScopeDependency
/// </summary>
/// <param name="userNo"></param>
/// <param name="taskType"></param>
/// <param name="source"></param>
/// <returns></returns>
Task GenerateDeviceTasksAsync(string userNo, DeviceTaskEnumType taskType);
Task GenerateDeviceTasksAsync(string userNo, DeviceTaskEnumType taskType, DeviceTaskSourceEnumType source);
/// <summary>
/// 获取用户所有设备权限

9
Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
View File

@@ -164,7 +164,7 @@ public class DevicePermissionService : IDevicePermissionService
public async Task GenerateDeviceTasksAsync(Func<Task> func, List<string> userNos)
{
var tenantId = _currentUser.GetStringTenantId();
//获取所有人的权限
if (userNos.IsEmpty())
userNos = await GetPermissionUserNosAsync();
@@ -232,6 +232,7 @@ public class DevicePermissionService : IDevicePermissionService
UserNo = userNo,
Version = 0,
TenantId = tenant,
Source = DeviceTaskSourceEnumType.Manually
}));
addItems.ForEach(x => waitAddTasks.Add(new DeviceTaskEntity
@@ -243,6 +244,7 @@ public class DevicePermissionService : IDevicePermissionService
UserNo = userNo,
Version = 0,
TenantId = tenant,
Source = DeviceTaskSourceEnumType.Manually
}));
}
}
@@ -327,6 +329,7 @@ public class DevicePermissionService : IDevicePermissionService
UserNo = userNo,
Version = 0,
TenantId = tenant,
Source = DeviceTaskSourceEnumType.Schedule
}));
addItems.ForEach(x => waitTasks.Add(new DeviceTaskEntity
@@ -338,6 +341,7 @@ public class DevicePermissionService : IDevicePermissionService
UserNo = userNo,
Version = 0,
TenantId = tenant,
Source = DeviceTaskSourceEnumType.Schedule
}));
}
}
@@ -441,7 +445,7 @@ public class DevicePermissionService : IDevicePermissionService
return page;
}
public async Task GenerateDeviceTasksAsync(string userNo, DeviceTaskEnumType taskType)
public async Task GenerateDeviceTasksAsync(string userNo, DeviceTaskEnumType taskType, DeviceTaskSourceEnumType source)
{
var deviceCodes = await GetAssignDeviceCodesAsync(userNo);
if (!deviceCodes.Any()) return;
@@ -462,6 +466,7 @@ public class DevicePermissionService : IDevicePermissionService
Priority = 0,
Version = 0,
TenantId = x.TenantId,
Source = source
}).ToList();
await _dbContext.InsertAsync(tasks);

6
Src/Dlhis.Basic/Device/Services/Implements/DeviceTimePeriodService.cs
View File

@@ -159,9 +159,9 @@ public class DeviceTimePeriodService : IDeviceTimePeriodService
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
CancellationId = 0,
Source = null,
Source = DeviceTaskSourceEnumType.Manually,
Priority = 90,
TenantId = device.TenantId
TenantId = device.TenantId,
});
continue;
@@ -192,7 +192,7 @@ public class DeviceTimePeriodService : IDeviceTimePeriodService
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
CancellationId = 0,
Source = null,
Source = DeviceTaskSourceEnumType.Manually,
Priority = 90,
TenantId = device.TenantId
});

6
Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs
View File

@@ -124,7 +124,7 @@ public class GainfoFaceService : IGainfoFaceService
await _faceDbContext.UpdateAsync(face);
}
await _devicePermissionService.GenerateDeviceTasksAsync(gainfo.No, taskType);
await _devicePermissionService.GenerateDeviceTasksAsync(gainfo.No, taskType, DeviceTaskSourceEnumType.Photo);
}
public async Task<string> GetExternalFaceAsync(string idno)
@@ -240,7 +240,7 @@ public class GainfoFaceService : IGainfoFaceService
// var url = $"https://pay.aizhuhotel.com/{prefix}/api/face";
//生成任务
await _devicePermissionService.GenerateDeviceTasksAsync(gainfo.No, taskType);
await _devicePermissionService.GenerateDeviceTasksAsync(gainfo.No, taskType, DeviceTaskSourceEnumType.Photo);
}
public async Task UploadFacesAsync(List<GainfoUploadFaceRequest> requests)
@@ -285,7 +285,7 @@ public class GainfoFaceService : IGainfoFaceService
}
//生成任务
await _devicePermissionService.GenerateDeviceTasksAsync(gainfo.No, taskType);
await _devicePermissionService.GenerateDeviceTasksAsync(gainfo.No, taskType, DeviceTaskSourceEnumType.Photo);
}
}

2
Src/Dlhis.Basic/Organization/Services/Implements/GainfoPermissionService.cs
View File

@@ -181,7 +181,7 @@ public class GainfoPermissionService : IGainfoPermissionService
DeviceType = x.Type,
TenantId = gainfo.Factory,
Priority = 10,
Source = DeviceTaskSourceEnumType.Manually
}).ToList();
await _dbContext.InsertAsync(tasks);

4
Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
View File

@@ -262,7 +262,7 @@ public class GainfoService : IGainfoService
Version = 0,
ResultMessage = null,
CancellationId = 0,
Source = null,
Source = DeviceTaskSourceEnumType.Manually,
Priority = 60,
TenantId = x.TenantId
}).ToList());
@@ -408,7 +408,7 @@ public class GainfoService : IGainfoService
//海宁触发权限下发
if (gainfo.Workplace == "5")
{
await _devicePermissionService.GenerateDeviceTasksAsync(gainfo.No, DeviceTaskEnumType.Add);
await _devicePermissionService.GenerateDeviceTasksAsync(gainfo.No, DeviceTaskEnumType.Add, DeviceTaskSourceEnumType.Migration);
}
}
}

2
Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs
View File

@@ -28,7 +28,7 @@ public class GainfoEntity : SugarBaseEntity
/// 员类型
/// </summary>
[SugarColumn(ColumnDescription = "人员类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
public GainfoUserTypeEnumType? Type { get; set; }
public GainfoUserTypeEnumType Type { get; set; }
/// <summary>
/// 姓名

24
Src/Dlhis.Entity/Device/Enums/DeviceTaskSourceEnumType.cs
View File

@@ -8,6 +8,30 @@ namespace Dlhis.Entity.Device.Enums;
[Description("设备任务来源")]
public enum DeviceTaskSourceEnumType
{
/// <summary>
/// 手动分配
/// </summary>
[Description("手动分配")]
Manually = 1,
/// <summary>
/// 上传照片
/// </summary>
[Description("上传照片")]
Photo = 2,
/// <summary>
/// 数据迁移
/// </summary>
[Description("数据迁移")]
Migration = 3,
/// <summary>
/// 任务调度
/// </summary>
[Description("任务调度")]
Schedule = 4,
/// <summary>
/// 预约
/// </summary>

3
Src/Dlhis.Message/VisitorAppointmentHub.cs
View File

@@ -15,5 +15,6 @@ public class VisitorAppointmentHub : Hub<IVisitorAppointmentService>
public override async Task OnConnectedAsync()
{
_logger.LogInformation("链接");
await Task.CompletedTask;
}
}
}

5
Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogMyRecordRequest.cs
View File

@@ -10,10 +10,7 @@ public class DeviceUploadLogMyRecordRequest : IValidatableObject
/// <inheritdoc />
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
if (DateTimePeriod == null)
{
DateTimePeriod = new DateTimePeriod();
}
DateTimePeriod ??= new DateTimePeriod();
if (DateTimePeriod.Start != null)
{

1
Src/Dlhis.ScheduledTask/Jobs/CreateGetUploadRecordJob.cs
View File

@@ -39,6 +39,7 @@ public class CreateGetUploadRecordJob : BaseJob
Type = DeviceTaskEnumType.UploadRecord,
CancellationId = 0,
Priority = 50,
Source = DeviceTaskSourceEnumType.Schedule
}).ToList();
await DbContext.InsertAsync(tasks);

1
Src/Dlhis.ScheduledTask/Jobs/CreateSyncServerDateTimeJob.cs
View File

@@ -40,6 +40,7 @@ public class CreateSyncServerDateTimeJob : BaseJob
Type = DeviceTaskEnumType.SyncDateTime,
DeviceType = x.Type,
Priority = 49,
Source = DeviceTaskSourceEnumType.Schedule
}).ToList();
await DbContext.InsertAsync(tasks);

3
Src/Dlhis.ScheduledTask/TaskAssignment/Dto/TaskDto.cs
View File

@@ -1,4 +1,4 @@
using Dlhis.Entity.Device.Entities;
using Dlhis.Entity.Basic.Enums;
using Dlhis.Entity.Device.Enums;
namespace Dlhis.ScheduledTask.TaskAssignment.Dto;
@@ -17,6 +17,7 @@ public class TaskDto
public string OldUserNo { get; set; }
public string UserCode { get; set; }
public GainfoUserTypeEnumType UserType { get; set; }
public string UserName { get; set; }
public string DepartmentNo { get; set; }
public string DepartmentName { get; set; }

8
Src/Dlhis.ScheduledTask/TaskAssignment/Response/UserToDeviceResponse.cs
View File

@@ -1,4 +1,5 @@
using Kurisu.AspNetCore.CustomClass;
using Dlhis.Entity.Basic.Enums;
using Kurisu.AspNetCore.CustomClass;
namespace Dlhis.ScheduledTask.TaskAssignment.Response;
@@ -24,6 +25,11 @@ public class UserToDeviceResponse
/// </summary>
public string UserCode { get; set; }
/// <summary>
/// 人员类型
/// </summary>
public GainfoUserTypeEnumType UserType { get; set; }
/// <summary>
/// 人员名称
/// </summary>

2
Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
View File

@@ -89,6 +89,7 @@ public class AssignmentService : IAssignmentService
UserNo = item.UserNo,
OldUserNo = item.OldUserNo,
UserCode = item.UserCode,
UserType = item.UserType,
UserName = item.UserName,
DepartmentNo = item.DepartmentNo,
DepartmentName = item.DepartmentName,
@@ -276,6 +277,7 @@ public class AssignmentService : IAssignmentService
: deviceTask.UserId,
TaskId = deviceTask.Id,
Type = deviceTask.Type,
UserType = ga.Type,
DeviceUniqueNo = deviceTask.DeviceUniqueNo,
DeviceConnectionInfo = device.ConnectionInfo,
Brand = deviceTemplate.Brand,