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

Squashed commit of the following:

Browse Source 
commit d4ab7d407a141b80024f85eeaab0062bea016051
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 10:23:30 2024 +0800

    merge error

commit 6204fa4ed15e0be303f7eb62307476725b8e7e36
Merge: 7290f0b aaeacf4
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 10:19:41 2024 +0800

    Merge branch 'feat-PlacePermission' of https://git.dlhis.com/liguoyang/jinko.yikatong into feat-PlacePermission

commit 7290f0bd822c0e2bd957908fd58f6e99f22ad46b
Author: cheche <717840555@qq.com>
Date:   Tue Mar 12 15:05:28 2024 +0800

    fix 获取用户权限设备 优化

commit 41b94fa3a9596a38cda1b4bf4f345ce13fe5677a
Author: cheche <717840555@qq.com>
Date:   Tue Mar 12 13:13:23 2024 +0800

    fix  第一

commit aaeacf4ffa778eb6a6104e2349357644d038151b
Author: cheche <717840555@qq.com>
Date:   Tue Mar 12 15:05:28 2024 +0800

    fix 获取用户权限设备 优化

commit 9e6099c52d0318cba35e7c082cb4d3085b46b0fa
Author: cheche <717840555@qq.com>
Date:   Tue Mar 12 14:00:53 2024 +0800

    fix 营业点配置权限

commit b4565e34f48da0e5ef1d3dffa59d0ccf0d950920
Author: cheche <717840555@qq.com>
Date:   Tue Mar 12 13:13:23 2024 +0800

    fix  第一
This commit is contained in:
liguoyang
2024-03-19 10:24:41 +08:00
parent 153f0ecd2a
commit 793a3325f2
2 changed files with 73 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
View File

@@ -11,6 +11,7 @@ using Kurisu.Core.DataAccess.Dto;
using Kurisu.Core.DataAccess.Entity;
using Kurisu.Core.User.Abstractions;
using Kurisu.SqlSugar.Services;
using SqlSugar;
namespace Dlhis.Basic.Device.Services.Implements;
@@ -302,6 +303,9 @@ public class DevicePermissionService : IDevicePermissionService
/// <returns></returns>
public async Task<List<Guid>> GetAssignDeviceCodesAsync(string userNo)
{
var devices = await _dbContext.Queryable<DeviceEntity>().ToListAsync();
var deviceRegistries = await _dbContext.Queryable<DeviceRegistryEntity>().ToListAsync();
var gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.No == userNo).SingleAsync();
var gainfoGroups = await _dbContext.Queryable<GainfoGroupRelationshipEntity>().ToListAsync();
@@ -309,7 +313,7 @@ public class DevicePermissionService : IDevicePermissionService
var deviceGroups = await _dbContext.Queryable<DeviceGroupEntity>().ToListAsync();
var deviceRelationships = await _dbContext.Queryable<DeviceGroupRelationshipEntity>().ToListAsync();
var result = GetAssignDeviceCodesInternal(gainfo, gainfoGroups, devicePermissions, deviceGroups, deviceRelationships);
var result = GetAssignDeviceCodesInternal(gainfo, gainfoGroups, devicePermissions, deviceGroups, deviceRelationships, deviceRegistries, devices);
return result.SelectMany(x => x.Codes).ToList();
}
@@ -321,13 +325,22 @@ public class DevicePermissionService : IDevicePermissionService
/// <returns></returns>
public async Task<Pagination<AssigmentByCodeResponse>> GetAssigmentByCodeAsync(AssigmentByCodeRequest request)
{
var lst1 = new List<Guid>();
//所有设备guid
var gds = await GetAssignmentsAsync(DeviceAssignmentTypeEnumType.Device, AssignTypeEnumType.User, request.No);
if (gds != null && gds.Count > 0)
{
lst1.AddRange(gds);
}
//所有设备组guid
var ggs = await GetAssignmentsAsync(DeviceAssignmentTypeEnumType.Group, AssignTypeEnumType.User, request.No);
//所有营业点guid
var gps = await GetAssignmentsAsync(DeviceAssignmentTypeEnumType.BusinessPlace, AssignTypeEnumType.User, request.No);
var devices = await _dbContext.Queryable<DeviceEntity>().ToListAsync();
var regiss = await _dbContext.Queryable<DeviceRegistryEntity>().ToListAsync();
if (ggs != null && ggs.Count > 0)
{
@@ -337,11 +350,23 @@ public class DevicePermissionService : IDevicePermissionService
.Where(x => x.GroupCode == gid)
.Select(x => x.DeviceCode)
.ToListAsync();
gds.AddRange(ds);
lst1.AddRange(ds);
}
}
if (gps != null && gps.Count > 0)
{
foreach (var placeCode in gps)
{
var nos = regiss.Where(x => x.BusinessPlaceCode == placeCode)
.Select(x => x.DeviceUniqueNo).ToList();
var dcodes = devices.Where(d => nos.Contains(d.UniqueNo))
.Select(d => d.Code).ToList();
lst1.AddRange(dcodes);
}
}
var dds = gds.Distinct().ToList();
var dds = lst1.Distinct().ToList();
var lst = devices.Where(x => dds.Contains(x.Code))
.Select(x => new AssigmentByCodeResponse
{
@@ -445,6 +470,9 @@ public class DevicePermissionService : IDevicePermissionService
private async Task<Dictionary<string, List<UserTenantDeviceCodeDto>>> GetAssignDeviceCodesInternalAsync(List<string> userNos)
{
var devices = await _dbContext.Queryable<DeviceEntity>().ToListAsync();
var regiss = await _dbContext.Queryable<DeviceRegistryEntity>().Where(x => !SqlFunc.IsNullOrEmpty(x.BusinessPlaceCode)).ToListAsync();
var gainfos = await _dbContext.Queryable<GainfoEntity>().Where(x => userNos.Contains(x.No)).ToListAsync();
if (!gainfos.Any())
{
@@ -460,23 +488,27 @@ public class DevicePermissionService : IDevicePermissionService
foreach (var gainfo in gainfos)
{
var codes = GetAssignDeviceCodesInternal(gainfo, gainfoGroupRelationships, devicePermissions, deviceGroups, deviceRelationships);
var codes = GetAssignDeviceCodesInternal(gainfo, gainfoGroupRelationships, devicePermissions, deviceGroups, deviceRelationships, regiss, devices);
result.Add(gainfo.No, codes);
}
return result;
}
private static List<UserTenantDeviceCodeDto> GetAssignDeviceCodesInternal(
private static List<UserTenantDeviceCodeDto> GetAssignDeviceCodesInternal(
GainfoEntity gainfo,
List<GainfoGroupRelationshipEntity> gainfoGroupRelationships,
List<DevicePermissionEntity> devicePermissions,
List<DeviceGroupEntity> deviceGroups,
List<DeviceGroupRelationshipEntity> deviceGroupRelationships)
List<DeviceGroupRelationshipEntity> deviceGroupRelationships,
List<DeviceRegistryEntity> deviceRegistries,
List<DeviceEntity> devices
)
{
var userNo = gainfo.No;
var deviceCodes = new List<UserTenantDeviceCodeDto>();
var deviceGroupCodes = new List<UserTenantDeviceCodeDto>();
var placeCodes = new List<UserTenantDeviceCodeDto>();
//获取人员的分组,跨基地
var gainfoGroups = gainfoGroupRelationships.Where(x => x.UserNo == userNo).Select(x => x.GroupCode).ToList();
@@ -484,32 +516,43 @@ public class DevicePermissionService : IDevicePermissionService
//按用户
var du = GetAssignCodesInternal(devicePermissions, deviceGroups, DeviceAssignmentTypeEnumType.Device, AssignTypeEnumType.User, userNo);
var gu = GetAssignCodesInternal(devicePermissions, deviceGroups, DeviceAssignmentTypeEnumType.Group, AssignTypeEnumType.User, userNo);
var pu = GetAssignCodesInternal(devicePermissions, deviceGroups, DeviceAssignmentTypeEnumType.BusinessPlace, AssignTypeEnumType.User, userNo);
deviceCodes.AddRange(du);
deviceGroupCodes.AddRange(gu);
placeCodes.AddRange(pu);
//按用户组
foreach (var groupCode in gainfoGroups)
{
var dg = GetAssignCodesInternal(devicePermissions, deviceGroups, DeviceAssignmentTypeEnumType.Device, AssignTypeEnumType.Group, groupCode.ToString());
var gg = GetAssignCodesInternal(devicePermissions, deviceGroups, DeviceAssignmentTypeEnumType.Group, AssignTypeEnumType.Group, groupCode.ToString());
var pg = GetAssignCodesInternal(devicePermissions, deviceGroups, DeviceAssignmentTypeEnumType.BusinessPlace, AssignTypeEnumType.Group, groupCode.ToString());
deviceCodes.AddRange(dg);
deviceGroupCodes.AddRange(gg);
placeCodes.AddRange(pg);
}
//按部门
var gainfoFactoryDevicePermissions = devicePermissions.Where(x => x.TenantId == gainfo.Factory).ToList();
var dd = GetAssignCodesInternal(gainfoFactoryDevicePermissions, deviceGroups, DeviceAssignmentTypeEnumType.Device, AssignTypeEnumType.Department, gainfo.DepartmentNo);
var gd = GetAssignCodesInternal(gainfoFactoryDevicePermissions, deviceGroups, DeviceAssignmentTypeEnumType.Group, AssignTypeEnumType.Department, gainfo.DepartmentNo);
var pd = GetAssignCodesInternal(gainfoFactoryDevicePermissions, deviceGroups, DeviceAssignmentTypeEnumType.BusinessPlace, AssignTypeEnumType.Department, gainfo.DepartmentNo);
deviceCodes.AddRange(dd);
deviceGroupCodes.AddRange(gd);
placeCodes.AddRange(pd);
//按厂区
var dt = GetAssignCodesInternal(devicePermissions, deviceGroups, DeviceAssignmentTypeEnumType.Device, AssignTypeEnumType.Tenant, gainfo.Factory);
var gt = GetAssignCodesInternal(devicePermissions, deviceGroups, DeviceAssignmentTypeEnumType.Group, AssignTypeEnumType.Tenant, gainfo.Factory);
var pt = GetAssignCodesInternal(devicePermissions, deviceGroups, DeviceAssignmentTypeEnumType.BusinessPlace, AssignTypeEnumType.Tenant, gainfo.Factory);
placeCodes.AddRange(pt);
deviceCodes.AddRange(dt);
deviceGroupCodes.AddRange(gt);
var groupCodes = deviceGroupCodes.SelectMany(x => x.Codes).Distinct().ToList();
var placecodes = placeCodes.SelectMany(x => x.Codes).Distinct().ToList();
var deveiceCodesByGroup = deviceGroupRelationships.Where(x => groupCodes.Contains(x.GroupCode)).GroupBy(x => x.TenantId)
.Select(x => new UserTenantDeviceCodeDto
{
@@ -517,7 +560,24 @@ public class DevicePermissionService : IDevicePermissionService
Codes = x.Select(item => item.DeviceCode).Distinct().ToList()
});
var placeGroup = deviceRegistries.Where(x => placecodes.Contains((Guid)x.BusinessPlaceCode)).GroupBy(x => x.TenantId)
.Select(x => new UserTenantDeviceCodeDto
{
Tenant = x.Key,
}).ToList();
placeGroup.ForEach(t =>
{
var nos = deviceRegistries.Where(x => placecodes.Contains((Guid)x.BusinessPlaceCode))
.Where(x => x.TenantId == t.Tenant)
.Select(x => x.DeviceUniqueNo)
.ToList();
t.Codes = devices.Where(d => nos.Contains(d.UniqueNo)).Select(d => d.Code).ToList();
});
deviceCodes.AddRange(deveiceCodesByGroup);
deviceCodes.AddRange(placeGroup);
return deviceCodes.GroupBy(x => x.Tenant).Select(x => new UserTenantDeviceCodeDto
{

8
Src/Dlhis.Entity/Sys/Enums/DeviceAssignmentTypeEnumType.cs
View File

@@ -18,5 +18,11 @@ public enum DeviceAssignmentTypeEnumType
/// 设备组
/// </summary>
[Description("设备组")]
Group = 2
Group = 2,
/// <summary>
/// 营业点
/// </summary>
[Description("营业点")]
BusinessPlace = 3,
}