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

Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

Browse Source
This commit is contained in:
cheche
2024-01-17 10:42:24 +08:00
parent 7aa2a071e0 fddb0b12fc
commit 5e8bd7b08f
5 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj
View File

@@ -22,6 +22,7 @@
<PackageReference Include="Hangfire.MySqlStorage" Version="2.0.3" />
<PackageReference Include="Kurisu.AspNetCore" Version="0.5.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.26" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
</ItemGroup>
<ItemGroup>

1
Src/Dlhis.ScheduledTask/Dockerfile
View File

@@ -8,6 +8,7 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
WORKDIR /src
COPY ["Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj", "Src/Dlhis.ScheduledTask/"]
COPY ["Src/Dlhis.Entity/Dlhis.Entity.csproj", "Src/Dlhis.Entity/"]
COPY ["Src/Dlhis.User.Api/Dlhis.User.Api.csproj", "Src/Dlhis.User.Api/"]
RUN dotnet restore "Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj"
COPY . .
WORKDIR "/src/Src/Dlhis.ScheduledTask"

7
Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/AssignmentsController.cs
View File

@@ -44,13 +44,14 @@ public class AssignmentsController : ControllerBase
/// <summary>
/// 更新任务状态
/// </summary>
/// <param name="request"></param>
/// <param name="requests"></param>
/// <returns></returns>
[HttpPost("taskstatus")]
public async Task UpdateDeviceTaskStatusAsync(UpdateDeviceTaskStatusRequest request)
public async Task UpdateDeviceTaskStatusAsync(List<UpdateDeviceTaskStatusRequest> requests)
{
await _assignmentService.UpdateDeviceTaskStatusAsync(request);
await _assignmentService.UpdateDeviceTaskStatusAsync(requests);
}
/// <summary>
/// 获取新人脸照片
/// </summary>

4
Src/Dlhis.ScheduledTask/TaskAssignment/Services/IAssignmentService.cs
View File

@@ -16,9 +16,9 @@ public interface IAssignmentService : IScopeDependency
/// <summary>
/// 更新设备任务状态
/// </summary>
/// <param name="request"></param>
/// <param name="requests"></param>
/// <returns></returns>
Task UpdateDeviceTaskStatusAsync(UpdateDeviceTaskStatusRequest request);
Task UpdateDeviceTaskStatusAsync(List<UpdateDeviceTaskStatusRequest> requests);
/// <summary>
/// 获取新人脸照片

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

@@ -188,10 +188,24 @@ public class AssignmentService : IAssignmentService
}
public async Task UpdateDeviceTaskStatusAsync(UpdateDeviceTaskStatusRequest request)
public async Task UpdateDeviceTaskStatusAsync(List<UpdateDeviceTaskStatusRequest> requests)
{
for (int i = 0; i < 5; i++)
foreach (var request in requests)
{
//for (int i = 0; i < 5; i++)
//{
// if (effect == 0)
// {
// continue;
// }
// return;
//}
//throw new UserFriendlyException("操作失败,请重试");
var deviceTask = await _dbContext.Queryable<DeviceTaskEntity>().Where(x => x.Id == request.TaskId).SingleAsync();
deviceTask.ThrowIfNull("设备任务不存在");
(deviceTask.Status != DeviceTaskStatusEnumType.Process)
@@ -206,16 +220,7 @@ public class AssignmentService : IAssignmentService
.SetColumns(x => x.ModifiedTime == DateTime.Now)
.Where(x => x.Id == request.TaskId && x.Version == deviceTask.Version)
.ExecuteCommandAsync();
if (effect == 0)
{
continue;
}
return;
}
throw new UserFriendlyException("操作失败,请重试");
}