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
2024-03-05 20:38:00 +08:00
parent eada9b6af9
commit 8157f0a01b
8 changed files with 50 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dlhis.Jinko.Face.sln
View File

@@ -29,7 +29,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Canteen", "Src\Dlhis.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Sys.Api", "Src\Dlhis.Sys.Api\Dlhis.Sys.Api.csproj", "{85A345C7-913E-4C1B-BE1C-600DE408A02F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dlhis.Basic.Api", "Src\Dlhis.Basic.Api\Dlhis.Basic.Api.csproj", "{1F337648-8A22-4601-A842-0F634FBA2825}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Basic.Api", "Src\Dlhis.Basic.Api\Dlhis.Basic.Api.csproj", "{1F337648-8A22-4601-A842-0F634FBA2825}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

2
Src/Dlhis.Basic/Device/Request/DeviceGroupSaveRequest.cs
View File

@@ -10,7 +10,7 @@ public class DeviceGroupSaveRequest
/// <summary>
/// 上级分组
/// </summary>
public Guid? PCode { get; set; }
public Guid PCode { get; set; }
/// <summary>
/// 设备组名称

10
Src/Dlhis.Basic/Device/Response/DeviceGroupTreeResponse.cs
View File

@@ -1,5 +1,6 @@
using Dlhis.Entity.Device.Enums;
using Kurisu.AspNetCore.Utils.Extensions;
using Microsoft.AspNetCore.Server.IISIntegration;
using Newtonsoft.Json;
namespace Dlhis.Basic.Device.Response;
@@ -50,6 +51,15 @@ public class DeviceGroupTreeResponse
}
}
public bool Editable { get; set; }
public bool IsDefault { get; set; }
/// <summary>
/// 是否允许设置下级
/// </summary>
public bool AbleSetNext => IsDefault;
[JsonIgnore]
public string TenantId { get; set; }

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

@@ -3,7 +3,6 @@ using Dlhis.Basic.Device.Response;
using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Device.Entities;
using Dlhis.Entity.Device.Enums;
using Kurisu.AspNetCore.UnifyResultAndValidation;
using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.User.Abstractions;
using Kurisu.SqlSugar.Services;
@@ -46,19 +45,13 @@ public class DeviceGroupService : IDeviceGroupService
//检查父级节点
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("分组类型必须与上级类型保持一致");
if (!request.Id.HasValue)
{
if (request.PCode.HasValue)
{
var pGrp = await _dbContext.Queryable<DeviceGroupEntity>().Where(x => x.Code == request.PCode).FirstAsync();
if (pGrp != null && pGrp.Type != request.Type)
{
throw new UserFriendlyException("分组类型必须与上级类型保持一致");
}
}
var entity = request.Adapt<DeviceGroupEntity>();
entity.Editable = true;
entity.Code = Guid.NewGuid();
await _dbContext.InsertAsync(entity);
@@ -69,31 +62,18 @@ public class DeviceGroupService : IDeviceGroupService
entity.ThrowIfNull("设备组不存在,无法更新");
entity.Editable.ThrowIfFalse("不可编辑当前组");
if (entity.PCode.HasValue)
if (request.Type != entity.Type)
{
var pGrp = await _dbContext.Queryable<DeviceGroupEntity>().Where(x => x.Code == request.PCode).FirstAsync();
if (pGrp != null && pGrp.Type != request.Type)
{
throw new UserFriendlyException("分组类型必须与上级类型保持一致");
}
}
else
{
var nGrp = await _dbContext.Queryable<DeviceGroupEntity>().Where(x => x.PCode == entity.Code).FirstAsync();
if (nGrp != null && nGrp.Type != request.Type)
{
throw new UserFriendlyException("存在下级分组类型不一致,无法修改");
}
}
//检查下级分组type不一致
var existsDiffNextGroups = await _dbContext.Queryable<DeviceGroupEntity>()
.Where(x => x.PCode == entity.Code)
.Where(x => x.Type != request.Type)
.AnyAsync();
existsDiffNextGroups.ThrowIfTrue("存在下级分组类型不一致,无法修改");
var nextDevices = await GetDevicesAsync(entity.Code);
if (!entity.Type.HasValue)
{
(request.Type.HasValue && nextDevices.Any(x => x.Type != request.Type)).ThrowIfTrue($"分组设备存在非{request.Type.Value.GetDescription()}类型的设备设备");
}
else
{
(request.Type.HasValue && request.Type != entity.Type && nextDevices.Any()).ThrowIfTrue("分组设备类型不匹配,无法修改类型");
nextDevices.Any(x => x.Type != request.Type).ThrowIfTrue("分组设备类型不匹配,无法修改类型");
}
request.Adapt(entity);
@@ -185,10 +165,7 @@ public class DeviceGroupService : IDeviceGroupService
{
var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => request.DeviceCodes.Contains(x.Code)).ToListAsync();
//检查分组的分类控制
if (group.Type.HasValue)
{
devices.Any(x => x.Type != group.Type).ThrowIfTrue("存在设备类型有误,无法分配到当前分组");
}
//重新赋值到请求参数中
request.DeviceCodes = devices.Select(x => x.Code).ToList();

12
Src/Dlhis.Basic/Organization/Response/GainfoGroupTreeResponse.cs
View File

@@ -24,10 +24,20 @@ public class GainfoGroupTreeResponse
public string Remark { get; set; }
/// <summary>
/// 是否编辑
/// 是否可编辑
/// </summary>
public bool Editable { get; set; }
/// <summary>
/// 是否为业务默认分组
/// </summary>
public bool IsDefault { get; set; }
/// <summary>
/// 是否允许设置下级
/// </summary>
public bool AbleSetNext => IsDefault;
[JsonIgnore]
public string TenantId { get; set; }

2
Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
View File

@@ -59,14 +59,12 @@ public class GainfoGroupService : IGainfoGroupService
{
var entity = request.Adapt<GainfoGroupEntity>();
entity.Code = Guid.NewGuid();
entity.Editable = true;
await _dbContext.InsertAsync(entity);
}
else
{
var entity = await _dbContext.Queryable<GainfoGroupEntity>().Where(x => x.Id == request.Id).SingleAsync();
request.Adapt(entity);
entity.Editable = true;
await _dbContext.UpdateAsync(entity);
}
}

12
Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs
View File

@@ -15,8 +15,8 @@ public class DeviceGroupEntity : SugarBaseEntity, ITenantId, ISoftDeleted
/// <summary>
/// 设备组功能类型
/// </summary>
[SugarColumn(IsNullable = true, ColumnDescription = "设备组功能类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
public DeviceTypeEnumType? Type { get; set; }
[SugarColumn(IsNullable = false, ColumnDescription = "设备组功能类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
public DeviceTypeEnumType Type { get; set; }
/// <summary>
/// 上级设备组code
@@ -40,9 +40,15 @@ public class DeviceGroupEntity : SugarBaseEntity, ITenantId, ISoftDeleted
/// <summary>
/// 是否可编辑
/// </summary>
[SugarColumn(ColumnDescription = "是否可编辑")]
[SugarColumn(ColumnDataType = "bit", DefaultValue = "1", ColumnDescription = "是否可编辑")]
public bool Editable { get; set; }
/// <summary>
/// 可设置下级
/// </summary>
[SugarColumn(ColumnDataType = "bit", DefaultValue = "1")]
public bool AbleSetNext { get; set; }
/// <summary>
/// 备注
/// </summary>

3
Src/Dlhis.ScheduledTask/CommonJobs/CreateDefinitelyGroupJob.cs
View File

@@ -106,6 +106,7 @@ public class CreateDefinitelyGroupJob
Type = type,
Name = grp,
Editable = false,
AbleSetNext = false,
Remark = _remark,
CreatedBy = 1,
@@ -130,6 +131,7 @@ public class CreateDefinitelyGroupJob
Type = type,
Name = workplaceName,
Editable = false,
AbleSetNext = false,
Remark = _remark,
CreatedBy = 1,
@@ -153,6 +155,7 @@ public class CreateDefinitelyGroupJob
Type = type,
Name = factoryName,
Editable = false,
AbleSetNext = true,
Remark = _remark,
CreatedBy = 1,