yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 优化细节和tenant问题

Browse Source
This commit is contained in:
liguoyang
2024-03-06 19:22:14 +08:00
parent 6352ffd9af
commit 9f771bc865
6 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Src/Dlhis.Basic/Device/Controllers/DeviceGroupsController.cs
View File

@@ -43,6 +43,7 @@ public class DeviceGroupsController : ControllerBase
/// <param name="request"></param>
/// <returns></returns>
[HttpPost("save")]
[IgnoreTenant]
public async Task SaveAsync(DeviceGroupSaveRequest request)
{
await _deviceGroupService.SaveAsync(request);

4
Src/Dlhis.Basic/Device/Request/DevicePermissionSaveReuqest.cs
View File

@@ -27,7 +27,7 @@ public class DevicePermissionSaveReuqest
public DeviceAssignmentTypeEnumType UniqueType { get; set; }
/// <summary>
/// 分配权限值不能为空
/// 分配权限值
/// </summary>
public List<Guid> Codes { get; set; } = new List<Guid>();
public List<Guid> Codes { get; set; }
}

35
Src/Dlhis.Basic/Device/Services/Implements/DeviceGroupService.cs
View File

@@ -43,11 +43,7 @@ public class DeviceGroupService : IDeviceGroupService
public async Task SaveAsync(DeviceGroupSaveRequest request)
{
//检查父级节点
await CheckPCodeExistsDeviceAsync(request.PCode);
var pGrp = await _dbContext.Queryable<DeviceGroupEntity>().Where(x => x.Code == request.PCode).FirstAsync();
pGrp.AbleSetNext.ThrowIfFalse($"分组{pGrp.Name}不可添加下级");
(pGrp != null && pGrp.Type != request.Type).ThrowIfTrue("分组类型必须与上级类型保持一致");
var pGrp = await CheckPCodeAsync(request);
if (!request.Id.HasValue)
{
@@ -59,8 +55,8 @@ public class DeviceGroupService : IDeviceGroupService
else
{
var entity = await _dbContext.Queryable<DeviceGroupEntity>().Where(x => x.Id == request.Id).FirstAsync();
entity.ThrowIfNull("设备组不存在,无法更新");
entity.Editable.ThrowIfFalse("不可编辑当前组");
entity.ThrowIfNull("设备分组不存在,无法更新");
entity.Editable.ThrowIfFalse("不可编辑当前分组");
if (request.Type != entity.Type)
{
@@ -84,7 +80,7 @@ public class DeviceGroupService : IDeviceGroupService
public async Task DeleteAsync(long id)
{
var deviceGroup = await _dbContext.Queryable<DeviceGroupEntity>().Where(x => x.Id == id).FirstAsync();
deviceGroup.ThrowIfNull("设备组不存在,无需删除");
deviceGroup.ThrowIfNull("设备分组不存在,无需删除");
await _dbContext.DeleteAsync(deviceGroup);
}
@@ -131,28 +127,35 @@ public class DeviceGroupService : IDeviceGroupService
/****************************************************** help methods *********************************************************/
/// <summary>
/// 检查父级分组存在设备
/// 检查父级分组
/// </summary>
/// <param name="pCode"></param>
/// <param name="request"></param>
/// <returns></returns>
private async Task CheckPCodeExistsDeviceAsync(Guid? pCode)
private async Task<DeviceGroupEntity> CheckPCodeAsync(DeviceGroupSaveRequest request)
{
if (pCode.HasValue)
var pGrp = await _dbContext.Queryable<DeviceGroupEntity>().Where(x => x.Code == request.PCode).FirstAsync();
if (pGrp != null)
{
var exists = await _dbContext.Queryable<DeviceGroupRelationshipEntity>().Where(x => x.GroupCode == pCode).AnyAsync();
(!pGrp.AbleSetNext && !request.Id.HasValue).ThrowIfTrue($"{pGrp.Name}不可添加下级");
var exists = await _dbContext.Queryable<DeviceGroupRelationshipEntity>().Where(x => x.GroupCode == request.PCode).AnyAsync();
exists.ThrowIfTrue("父级分组存在设备");
}
(pGrp != null && pGrp.Type != request.Type).ThrowIfTrue("分组类型必须与上级类型保持一致");
return pGrp;
}
/// <summary>
///
/// 检查分组是否存在下级
/// </summary>
/// <param name="currentCode"></param>
/// <returns></returns>
private async Task CheckNoNextGroupAsync(Guid currentCode)
{
var exists = await _dbContext.Queryable<DeviceGroupEntity>().Where(x => x.PCode == currentCode).AnyAsync();
exists.ThrowIfTrue("存在下级设备分组");
exists.ThrowIfTrue("存在下级设备分组,无法分配设备");
}
/// <summary>
@@ -165,7 +168,7 @@ public class DeviceGroupService : IDeviceGroupService
{
var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => request.DeviceCodes.Contains(x.Code)).ToListAsync();
//检查分组的分类控制
devices.Any(x => x.Type != group.Type).ThrowIfTrue("存在设备类型有误,无法分配到当前分组");
devices.Any(x => x.Type != group.Type).ThrowIfTrue($"存在设备类型不一致,无法分配到当前{group.Type.GetDescription()}分组");
//重新赋值到请求参数中
request.DeviceCodes = devices.Select(x => x.Code).ToList();

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

@@ -47,19 +47,25 @@ public class DeviceService : IDeviceService
var deviceUniqueNos = page.Data.Select(x => x.UniqueNo).ToList();
var balanceRecords = await _dbContext.Queryable<BalanceRecordEntity>().Where(x => x.Type == BalanceRecordTypeEnumType.Out)
var balanceInfos = await _dbContext.Queryable<BalanceRecordEntity>().Where(x => x.Type == BalanceRecordTypeEnumType.Out)
.Where(x => deviceUniqueNos.Contains(x.DeviceInfo))
.Select(x => new
{
x.Amount,
x.UserCode
x.DeviceInfo,
Amount = SqlFunc.AggregateSum(x.Amount),
UserCount = SqlFunc.AggregateDistinctCount(x.UserCode)
})
.GroupBy(x => x.DeviceInfo)
.ToListAsync();
page.Data.ForEach(device =>
{
device.Amount = balanceRecords.Sum(x => x.Amount);
device.UserCount = balanceRecords.DistinctBy(x => x.UserCode).Count();
var info = balanceInfos.FirstOrDefault(x => x.DeviceInfo == device.UniqueNo);
if (info != null)
{
device.Amount = info.Amount;
device.UserCount = info.UserCount;
}
});
return page;

4
Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs
View File

@@ -13,7 +13,7 @@ namespace Dlhis.Entity.Sys.Entities;
public class DevicePermissionEntity : SugarBaseEntity, ITenantId
{
/// <summary>
/// 分配权限类型
/// 分配权限类型(User,Role,Group...)
/// </summary>
[SugarColumn(ColumnDataType = "varchar(50)", ColumnDescription = "分配权限类型", SqlParameterDbType = typeof(EnumToStringConvert))]
public AssignTypeEnumType AssignType { get; set; }
@@ -25,7 +25,7 @@ public class DevicePermissionEntity : SugarBaseEntity, ITenantId
public string AssignValue { get; set; }
/// <summary>
/// 设备权限类型
/// 设备权限类型(Device/DeviceGroup)
/// </summary>
[SugarColumn(ColumnDataType = "varchar(50)", ColumnDescription = "设备权限类型", SqlParameterDbType = typeof(EnumToStringConvert))]
public DeviceAssignmentTypeEnumType UniqueType { get; set; }

6
Src/Dlhis.ScheduledTask/CommonJobs/HeartbeatJob.cs
View File

@@ -38,11 +38,11 @@ public class HeartbeatJob
await _dbContext.Updateable<DeviceRegistryEntity>().SetColumns(x => x.LastHeartbeatTime == DateTime.Now)
.Where(x => x.DeviceUniqueNo == device.UniqueNo).ExecuteCommandAsync();
_logger.LogInformation("心跳设备成功:{no}", device.UniqueNo);
// _logger.LogInformation("心跳设备成功:{no}", device.UniqueNo);
}
catch (Exception ex)
catch (Exception)
{
_logger.LogError(ex, "心跳设备失败:{no}. {message}", device.UniqueNo, ex.Message);
//_logger.LogError(ex, "心跳设备失败:{no}. {message}", device.UniqueNo, ex.Message);
}
}
}