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);
}
}
}