From 54510f28eaa571edfd1ba28398b087822b2f24c0 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 25 Jan 2024 14:43:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=A7=BB=E9=99=A4brand=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Device/Services/Implements/DeviceConnectService.cs      | 1 -
 Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs | 2 --
 Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs               | 6 ------
 .../TaskAssignment/Services/Implements/AssignmentService.cs | 2 +-
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
index 75559b76..e507e5e5 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
@@ -120,7 +120,6 @@ public class DeviceConnectService : IDeviceConnectService
                 device = new DeviceEntity()
                 {
                     Code = Guid.NewGuid(),
-                    Brand = string.Empty,
                     ConnectionInfo = string.Empty,
                     TemplateCode = null,
                     UniqueNo = uniqueNo,
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
index 68f7f420..9403f1a2 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
@@ -48,7 +48,6 @@ public class DeviceService : IDeviceService
         {
             var entity = request.Adapt<DeviceEntity>();
             entity.Code = Guid.NewGuid();
-            entity.Brand = template.Brand;
             await _dbContext.InsertAsync(entity);
             //同时保存注册信息
             var registry = await _dbContext.Queryable<DeviceRegistryEntity>().Where(x => x.DeviceUniqueNo == request.UniqueNo).FirstAsync();
@@ -72,7 +71,6 @@ public class DeviceService : IDeviceService
             entity.ThrowIfNull("设备不存在,无法更新");
 
             request.Adapt(entity);
-            entity.Brand = template.Brand;
 
             await _dbContext.UpdateAsync(entity);
         }
diff --git a/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs b/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs
index 4b451a3c..18cdee52 100644
--- a/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs
@@ -29,12 +29,6 @@ public class DeviceEntity : SugarBaseEntity, ITenantId
     [SugarColumn(ColumnDescription = "心跳检查间隔")]
     public int HeartbeatInterval { get; set; }
 
-    /// <summary>
-    /// 品牌
-    /// </summary>
-    [SugarColumn(ColumnDescription = "品牌")]
-    public string Brand { get; set; }
-
     /// <summary>
     /// 供应商
     /// </summary>
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
index 72b402f7..3c485d7f 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
@@ -51,7 +51,7 @@ public class AssignmentService : IAssignmentService
                  deviceTask.Type,
                  deviceTask.DeviceUniqueNo,
                  DeviceConnectionInfo = deivce.ConnectionInfo,
-                 deivce.Brand,
+                 deivceTamplate.Brand,
                  FuncStr = deivce.Funcs.ToString(),
                  deviceTask.UserNo,
                  deviceTask.UserCode,