server/.NETAdmin
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
zpc 2025-08-14 11:24:46 +08:00
parent 25bac169b0
commit 003ea2b849
4 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
View File

@ -11,6 +11,7 @@ using System.Threading.Tasks;
using ZR.Repository;
using Aliyun.OSS;
using System.Linq;
using ZR.Model.System.Dto;
//创建时间：2025-08-05
namespace ZR.Admin.WebApi.Controllers.Business
@ -148,7 +149,6 @@ namespace ZR.Admin.WebApi.Controllers.Business
return SUCCESS(info);
}
/// <summary>
/// 查询端口详情
/// </summary>

51
ZR.Admin.WebApi/Controllers/Business/OdfRoomsController.cs
View File

@ -10,6 +10,10 @@ using SqlSugar;
using static SKIT.FlurlHttpClient.Wechat.Api.Models.WxaBusinessGetLiveInfoResponse.Types;
using Aliyun.OSS;
using Azure;
using ZR.Model.System.Dto;
using SkiaSharp;
using static SKIT.FlurlHttpClient.Wechat.Api.Models.CardMemberCardActivateUserFormSetRequest.Types;
using ZR.Model.System;
//创建时间：2025-08-05
namespace ZR.Admin.WebApi.Controllers.Business
@ -35,6 +39,8 @@ namespace ZR.Admin.WebApi.Controllers.Business
/// </summary>
private readonly ISysUserService _SysUserService;
/// <summary>
///机架
/// </summary>
@ -72,18 +78,6 @@ namespace ZR.Admin.WebApi.Controllers.Business
[ActionPermissionFilter(Permission = "odfrooms:list")]
public IActionResult QueryOdfRooms([FromQuery] OdfRoomsQueryDto parm)
{
//long userId = HttpContext.GetUId();
//var user = _SysUserService.SelectUserById(userId);
////user.RoleIds
//if (!user.IsAdmin && user.Roles.Any(it => it.DataScope == 4))
//{
// //user.DeptId;
// //parm.DeptIds = user.DeptIds;
//}
//else if (!user.IsAdmin && user.Roles.Any(it => it.DataScope == 3))
//{
// parm.DeptIds = new List<long>() { user.DeptId };
//}
var response = _OdfRoomsService.GetList(parm);
return SUCCESS(response);
}
@ -209,6 +203,39 @@ namespace ZR.Admin.WebApi.Controllers.Business
return SUCCESS(response);
}
/// <summary>
/// 查询公司下的所有区域
/// </summary>
/// <returns></returns>
[HttpGet("getcompany")]
[ActionPermissionFilter(Permission = "odfrooms:query")]
public IActionResult GetCompany()
{
var dept = sysDeptService.AsQueryable().Where(it => it.ParentId == 0 && it.Status == 0 && it.DelFlag == 0).First();
if (dept != null)
{
var list = sysDeptService.AsQueryable().Where(it => it.ParentId == dept.DeptId).Select(it => new { it.DeptId, it.DeptName }).ToList();
return SUCCESS(list);
}
return SUCCESS(new List<object>());
}
/// <summary>
/// 查询地区列表
/// </summary>
/// <param name="deptId"></param>
/// <returns></returns>
[HttpGet("getregion")]
[ActionPermissionFilter(Permission = "odfrooms:query")]
public IActionResult GetRegion([FromQuery] int deptId)
{
var list = sysDeptService.AsQueryable().Where(it => it.ParentId == deptId).Select(it => new { it.DeptId, it.DeptName }).ToList();
return SUCCESS(list);
}
/// <summary>
/// 添加机房列表

1
ZR.Model/Business/Dto/OdfRoomsDto.cs
View File

@ -10,6 +10,7 @@ namespace ZR.Model.Business.Dto
public string RoomAddress { get; set; }
public string Remarks { get; set; }
public int? DeptId { get; set; }
public List<long> DeptIds { get; set; }
}

7
ZR.Service/Business/OdfRoomsService.cs
View File

@ -131,6 +131,13 @@ namespace ZR.Service.Business
predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.RoomAddress), it => it.RoomAddress.Contains(parm.RoomAddress));
predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.Remarks), it => it.Remarks.Contains(parm.Remarks));
predicate = predicate.AndIF(parm.DeptIds != null && parm.DeptIds.Count > 0, it => parm.DeptIds.Contains(it.DeptId ?? 0));
if (parm.DeptId > 0)
{
var db = DbScoped.SugarScope.GetConnectionScope("0");
string sql = "WITH DeptCTE AS( SELECT DeptId, ParentId, DeptName FROM sys_dept WHERE DeptId =" + parm.DeptId + " UNION ALL SELECT d.DeptId, d.ParentId, d.DeptName FROM sys_dept d INNER JOIN DeptCTE cte ON d.ParentId = cte.DeptId WHERE d.DelFlag = 0) SELECT DeptId FROM DeptCTE ORDER BY DeptId";
var list = db.Ado.SqlQuery<long>(sql);
predicate = predicate.And(it => list.Contains(it.DeptId ?? 0));
}
return predicate;
}
/// <summary>