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-06-28 14:03:40 +08:00
parent 0214309e64
commit 9446ba6ffa
20 changed files with 427 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.ScheduledTask/TaskAssignment/Response/ScheduleDto.cs → Src/Dlhis.ScheduledTask/TaskAssignment/Dto/ScheduleDto.cs
View File

@@ -1,6 +1,6 @@
using Kurisu.AspNetCore.CustomClass;
namespace Dlhis.ScheduledTask.TaskAssignment.Response;
namespace Dlhis.ScheduledTask.TaskAssignment.Dto;
public class ScheduleDto
{

2
Src/Dlhis.ScheduledTask/TaskAssignment/Response/TaskCombineDto.cs → Src/Dlhis.ScheduledTask/TaskAssignment/Dto/TaskCombineDto.cs
View File

@@ -1,7 +1,7 @@
using Dlhis.Entity.Device.Enums;
using Kurisu.AspNetCore.Utils.Extensions;
namespace Dlhis.ScheduledTask.TaskAssignment.Response;
namespace Dlhis.ScheduledTask.TaskAssignment.Dto;
public class TaskCombineDto
{

4
Src/Dlhis.ScheduledTask/TaskAssignment/Response/DeviceTaskToDeviceResponse.cs
View File

@@ -1,4 +1,6 @@
namespace Dlhis.ScheduledTask.TaskAssignment.Response;
using Dlhis.ScheduledTask.TaskAssignment.Dto;
namespace Dlhis.ScheduledTask.TaskAssignment.Response;
/// <summary>
/// 设备任务

4
Src/Dlhis.ScheduledTask/TaskAssignment/Response/ScheduleToDeviceResponse.cs
View File

@@ -1,4 +1,6 @@
namespace Dlhis.ScheduledTask.TaskAssignment.Response;
using Dlhis.ScheduledTask.TaskAssignment.Dto;
namespace Dlhis.ScheduledTask.TaskAssignment.Response;
public class ScheduleToDeviceResponse
{

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

@@ -14,6 +14,11 @@ public class UserToDeviceResponse
/// </summary>
public string UserNo { get; set; }
/// <summary>
/// 老系统档案号
/// </summary>
public string OldUserNo { get; set; }
/// <summary>
/// 人员学工号
/// </summary>

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

@@ -51,7 +51,7 @@ public class AssignmentService : IAssignmentService
var dc = x.Key.DeviceConnectionInfo ?? "{}";
var func = x.Key.FuncStr ?? "[]";
var jobj = new JObject
var jObj = new JObject
{
{ "connectionInfo", JToken.Parse(dc) },
{ "function", JArray.Parse(func) }
@@ -61,7 +61,7 @@ public class AssignmentService : IAssignmentService
{
Brand = b,
DeviceUniqueNo = d,
DeviceInfo = jobj,
DeviceInfo = jObj,
Tasks = x.Select(item =>
{
var key = $"face:{item.UserCode}";
@@ -83,7 +83,7 @@ public class AssignmentService : IAssignmentService
{
dto.Info = new UserToDeviceResponse
{
UserId = item.UserId.HasValue ? item.UserId.Value : 0,
UserId = item.UserId ?? 0,
UserNo = item.UserNo,
UserCode = item.UserCode,
UserName = item.UserName,