fix 移除brand字段

This commit is contained in:
2024-01-25 14:43:21 +08:00
parent 83c3238a14
commit 54510f28ea
4 changed files with 1 additions and 10 deletions

View File

@@ -120,7 +120,6 @@ public class DeviceConnectService : IDeviceConnectService
device = new DeviceEntity()
{
Code = Guid.NewGuid(),
Brand = string.Empty,
ConnectionInfo = string.Empty,
TemplateCode = null,
UniqueNo = uniqueNo,

View File

@@ -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);
}

View File

@@ -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>

View File

@@ -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,