fix 下发任务结构修改,根据类型处理

Src/Dlhis.ScheduledTask/TaskAssignment/Response/DeviceTaskToDeviceResponse.cs

@@ -1,7 +1,7 @@
 namespace Dlhis.ScheduledTask.TaskAssignment.Response;
 
 /// <summary>
-/// 设备维度任务
+/// 设备任务
 /// </summary>
 public class DeviceTaskToDeviceByDeviceResponse
 {
@@ -16,12 +16,12 @@ public class DeviceTaskToDeviceByDeviceResponse
     public string DeviceUniqueNo { get; set; }
 
     /// <summary>
-    /// 连接信息
+    /// 设备信息
     /// </summary>
-    public string DeviceConnectionInfo { get; set; }
+    public object DeviceInfo { get; set; }
 
     /// <summary>
     /// 任务
     /// </summary>
-    public List<TaskCombineUserDimensionDto> Tasks { get; set; }
+    public List<TaskCombineDto> Tasks { get; set; }
 }

Src/Dlhis.ScheduledTask/TaskAssignment/Response/ScheduleDto.cs

@@ -0,0 +1,16 @@
+using Kurisu.Core.CustomClass;
+
+namespace Dlhis.ScheduledTask.TaskAssignment.Response;
+
+public class ScheduleDto
+{
+    /// <summary>
+    /// 假日名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 开始结束日期时段
+    /// </summary>
+    public DateTimePeriod DateTimePeriod { get; set; }
+}

Src/Dlhis.ScheduledTask/TaskAssignment/Response/ScheduleToDeviceResponse.cs

@@ -0,0 +1,24 @@
+namespace Dlhis.ScheduledTask.TaskAssignment.Response;
+
+public class ScheduleToDeviceResponse
+{
+    /// <summary>
+    /// 计划id,范围:1-128
+    /// </summary>
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 使能
+    /// </summary>
+    public bool Enable { get; set; }
+
+    /// <summary>
+    /// 计划名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 计划
+    /// </summary>
+    public List<ScheduleDto> Schedules { get; set; }
+}

Src/Dlhis.ScheduledTask/TaskAssignment/Response/TaskCombineDto.cs

@@ -3,7 +3,7 @@ using Kurisu.AspNetCore.Utils.Extensions;
 
 namespace Dlhis.ScheduledTask.TaskAssignment.Response;
 
-public class TaskCombineUserDimensionDto
+public class TaskCombineDto
 {
     /// <summary>
     /// 任务id
@@ -21,7 +21,7 @@ public class TaskCombineUserDimensionDto
     public string TypeDesc => Type.GetDescription();
 
     /// <summary>
-    /// 用户下发信息
+    /// 下发信息
     /// </summary>
-    public UserToDeviceResponse UserInfo { get; set; }
+    public object Info { get; set; }
 }

Src/Dlhis.ScheduledTask/TaskAssignment/Response/TimePeriodToDeviceResponse.cs

@@ -0,0 +1,21 @@
+using Kurisu.Core.CustomClass;
+
+namespace Dlhis.ScheduledTask.TaskAssignment.Response;
+
+public class TimePeriodToDeviceResponse
+{
+    /// <summary>
+    /// 时段码id
+    /// </summary>
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 星期
+    /// </summary>
+    public List<DayOfWeek> Weeks { get; set; }
+
+    /// <summary>
+    /// 时段区间
+    /// </summary>
+    public TimePeriod TimePeriod { get; set; }
+}

Src/Dlhis.ScheduledTask/TaskAssignment/Response/UserToDeviceResponse.cs

@@ -1,4 +1,6 @@
-namespace Dlhis.ScheduledTask.TaskAssignment.Response;
+using Kurisu.Core.CustomClass;
+
+namespace Dlhis.ScheduledTask.TaskAssignment.Response;
 
 public class UserToDeviceResponse
 {
@@ -32,7 +34,6 @@ public class UserToDeviceResponse
     /// </summary>
     public string DepartmentName { get; set; }
 
-
     /// <summary>
     /// 卡号
     /// </summary>
@@ -42,4 +43,24 @@ public class UserToDeviceResponse
     /// 人脸
     /// </summary>
     public string Face { get; set; }
+
+    /// <summary>
+    /// 有效日期范围
+    /// </summary>
+    public DatePeriod ValidDatePeriod { get; set; }
+
+    /// <summary>
+    /// 控制门[1,2,3....]
+    /// </summary>
+    public List<int> Doors { get; set; }
+
+    /// <summary>
+    /// 时段[1,2,3....]
+    /// </summary>
+    public List<int> TimePeriods { get; set; }
+
+    /// <summary>
+    /// 假期计划id
+    /// </summary>
+    public int Schedule { get; set; }
 }