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
2025-03-05 12:31:52 +08:00
parent c300b5b457
commit 66df7b809b
3 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
View File

@@ -26,7 +26,9 @@ public class DeviceConnectService : IDeviceConnectService
public async Task<string> RegisterAsync(DeviceRegisterRequest request) public async Task<string> RegisterAsync(DeviceRegisterRequest request)
{ {
var businessPlace = await _dbContext.Queryable<BusinessPlaceEntity>().Where(x => x.CustomCode == request.BusinessCustomCode).SingleAsync(); var businessPlace = await _dbContext.Queryable<BusinessPlaceEntity>()
.Where(x => x.CustomCode == request.BusinessCustomCode)
.SingleAsync();
businessPlace.ThrowIfNull("营业点不存在"); businessPlace.ThrowIfNull("营业点不存在");
var device = await GetEnableDeviceAsync(request.UniqueNo, false, request.DeployPlace, businessPlace.TenantId); var device = await GetEnableDeviceAsync(request.UniqueNo, false, request.DeployPlace, businessPlace.TenantId);
@@ -47,8 +49,7 @@ public class DeviceConnectService : IDeviceConnectService
DeviceUniqueNo = request.UniqueNo, DeviceUniqueNo = request.UniqueNo,
LastHeartbeatTime = DateTime.Now, LastHeartbeatTime = DateTime.Now,
RegisterTime = DateTime.Now, RegisterTime = DateTime.Now,
BusinessPlaceCode = businessPlace.Code, BusinessPlaceCode = businessPlace.Code
TenantId = device.TenantId
}; };
await _dbContext.InsertAsync(registry); await _dbContext.InsertAsync(registry);
@@ -163,7 +164,6 @@ public class DeviceConnectService : IDeviceConnectService
private async Task<DeviceEntity> GetEnableDeviceAsync(string uniqueNo, bool checkExists = true, string deployPlace = "", string tenantId = "") private async Task<DeviceEntity> GetEnableDeviceAsync(string uniqueNo, bool checkExists = true, string deployPlace = "", string tenantId = "")
{ {
var device = await _dbContext.Queryable<DeviceEntity>().Where(x => x.UniqueNo == uniqueNo).SingleAsync(); var device = await _dbContext.Queryable<DeviceEntity>().Where(x => x.UniqueNo == uniqueNo).SingleAsync();
if (checkExists) if (checkExists)
{ {
device.ThrowIfNull($"未知的设备唯一编码{uniqueNo}"); device.ThrowIfNull($"未知的设备唯一编码{uniqueNo}");
@@ -195,14 +195,6 @@ public class DeviceConnectService : IDeviceConnectService
await _dbContext.InsertAsync(device); await _dbContext.InsertAsync(device);
} }
else
{
if (tenantId.IsPresent())
{
device.TenantId = tenantId;
await _dbContext.UpdateAsync(device);
}
}
} }
return device; return device;

4
Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
View File

@@ -276,7 +276,7 @@ public class OrderService : IOrderService
.Where(x => x.DeviceUniqueNo == request.DeviceUniqueNo && x.BusinessPlaceCode.HasValue) .Where(x => x.DeviceUniqueNo == request.DeviceUniqueNo && x.BusinessPlaceCode.HasValue)
.Select((x, b, bs) => new .Select((x, b, bs) => new
{ {
b.Code, bs.ShiftCode, Factory = x.TenantId b.Code, bs.ShiftCode, Factory = b.TenantId
}) })
.SingleAsync(); .SingleAsync();
@@ -615,7 +615,7 @@ public class OrderService : IOrderService
.Where(x => x.DeviceUniqueNo == deviceUniqueNo && x.BusinessPlaceCode.HasValue) .Where(x => x.DeviceUniqueNo == deviceUniqueNo && x.BusinessPlaceCode.HasValue)
.Select((x, b, bs) => new .Select((x, b, bs) => new
{ {
b.Code, bs.ShiftCode, Factory = x.TenantId b.Code, bs.ShiftCode, Factory = b.TenantId
}) })
.SingleAsync(); .SingleAsync();

7
Src/Dlhis.Entity/Device/Entities/DeviceRegistryEntity.cs
View File

@@ -1,5 +1,4 @@
using Kurisu.AspNetCore.DataAccess.Entity; using Kurisu.AspNetCore.DataAccess.SqlSugar;
using Kurisu.AspNetCore.DataAccess.SqlSugar;
using SqlSugar; using SqlSugar;
namespace Dlhis.Entity.Device.Entities; namespace Dlhis.Entity.Device.Entities;
@@ -8,7 +7,7 @@ namespace Dlhis.Entity.Device.Entities;
/// 设备注册表 /// 设备注册表
/// </summary> /// </summary>
[SugarTable(TableName = "DeviceRegistry", TableDescription = "设备注册表")] [SugarTable(TableName = "DeviceRegistry", TableDescription = "设备注册表")]
public class DeviceRegistryEntity : SugarBaseEntity, ITenantId public class DeviceRegistryEntity : SugarBaseEntity
{ {
/// <summary> /// <summary>
/// 设备唯一号 /// 设备唯一号
@@ -33,6 +32,4 @@ public class DeviceRegistryEntity : SugarBaseEntity, ITenantId
/// </summary> /// </summary>
[SugarColumn(IsNullable = true, ColumnDescription = "营业点code")] [SugarColumn(IsNullable = true, ColumnDescription = "营业点code")]
public Guid? BusinessPlaceCode { get; set; } public Guid? BusinessPlaceCode { get; set; }
public string TenantId { get; set; }
} }