From 1975e37294de6a12c323d4fee0f1cd1522a7b213 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Tue, 11 Jun 2024 16:04:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=A1=A5=E5=85=85=E7=BC=BA=E5=B0=91?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Device/Response/DeviceUnderGroupResponse.cs    | 14 ++++++++++++--
 .../Services/Implements/DeviceGroupService.cs      |  4 +++-
 .../Request/DeviceTaskAssignmentRequest.cs         |  2 ++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Src/Dlhis.Basic/Device/Response/DeviceUnderGroupResponse.cs b/Src/Dlhis.Basic/Device/Response/DeviceUnderGroupResponse.cs
index 1edfa8a4..d5687c61 100644
--- a/Src/Dlhis.Basic/Device/Response/DeviceUnderGroupResponse.cs
+++ b/Src/Dlhis.Basic/Device/Response/DeviceUnderGroupResponse.cs
@@ -19,13 +19,23 @@ public class DeviceUnderGroupResponse
     /// </summary>
     public string Brand { get; set; }
 
+    /// <summary>
+    /// 部署点
+    /// </summary>
+    public string DeployPlace { get; set; }
+
+    /// <summary>
+    /// 连接信息
+    /// </summary>
+    public string ConnectionInfo { get; set; }
+
     /// <summary>
     /// 设备类型
     /// </summary>
     public DeviceTypeEnumType Type { get; set; }
-    
+
     /// <summary>
     /// 是否启用
     /// </summary>
     public bool Enable { get; set; }
-}
+}
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceGroupService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceGroupService.cs
index 673595f4..d4bd5f66 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceGroupService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceGroupService.cs
@@ -138,7 +138,9 @@ public class DeviceGroupService : IDeviceGroupService
                 Type = x.Type,
                 Code = x.Code,
                 Enable = x.Enable,
-                Brand = dt.Brand
+                Brand = dt.Brand,
+                DeployPlace = x.DeployPlace,
+                ConnectionInfo = x.ConnectionInfo,
             })
             .ToListAsync();
     }
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs
index d7c4a362..f0d5a9bf 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs
@@ -28,8 +28,10 @@ public class DeviceTaskAssignmentRequest : PageDto, IValidatableObject
     /// <summary>
     /// 厂区
     /// </summary>
+    [Required(ErrorMessage = "厂区不可为空")]
     public string Factory { get; set; }
 
+
     /// <summary>
     /// 搜索范围
     /// </summary>