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

333

Browse Source
This commit is contained in:
zpc 2025-08-14 13:00:27 +08:00
parent 003ea2b849
commit 8c98a81f79
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,10 +199,9 @@ namespace ZR.Admin.WebApi.Controllers.Business
{ {
it.RoomName, it.RoomName,
it.RoomAddress, it.RoomAddress,
it.Remarks, Remarks = string.IsNullOrEmpty(it.Remarks) ? "" : it.Remarks,
it.DeptName it.DeptName
}).ToListAsync(); }).ToListAsync();
var predicate = Expressionable.Create<OdfPorts>(); var predicate = Expressionable.Create<OdfPorts>();
var list = _OdfPortsService.AsQueryable().Where(it => it.Name.Contains(key) || it.Remarks.Contains(key) || it.HistoryRemarks.Contains(key) || it.OpticalAttenuation.Contains(key)).ToPage<OdfPorts, OdfPortsQuDto>(dto); var list = _OdfPortsService.AsQueryable().Where(it => it.Name.Contains(key) || it.Remarks.Contains(key) || it.HistoryRemarks.Contains(key) || it.OpticalAttenuation.Contains(key)).ToPage<OdfPorts, OdfPortsQuDto>(dto);
var roomId = list.Result.Select(it => it.RoomId).Distinct(); var roomId = list.Result.Select(it => it.RoomId).Distinct();
@ -216,7 +215,7 @@ namespace ZR.Admin.WebApi.Controllers.Business
} }
//roomList //roomList
}); });
return SUCCESS(new { Rooms = list, Ports = list }); return SUCCESS(new { Rooms = room, Ports = list });
} }

10
ZR.Admin.WebApi/appsettings.json
View File

@ -25,11 +25,11 @@
"urls": "http://*:8888", //项目启动url，如果改动端口前端对应devServer也需要进行修改 "urls": "http://*:8888", //项目启动url，如果改动端口前端对应devServer也需要进行修改
"corsUrls": [ "http://localhost:8887", "http://localhost:8886" ], //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开 "corsUrls": [ "http://localhost:8887", "http://localhost:8886" ], //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开
"JwtSettings": { "JwtSettings": {
"Issuer": "OpticalCableAdmin", //即token的签发者。 "Issuer": "giftclaim.NET", //即token的签发者。
"Audience": "OpticalCableAdmin", //指该token是服务于哪个群体的（群体范围） "Audience": "giftclaim.NET", //指该token是服务于哪个群体的（群体范围）
"SecretKey": "SecretKey-ZRADMIN.NET-202311281883831", "SecretKey": "SecretKey-giftclaim.NET-202508011883838",
"Expire": 144000, //jwt登录过期时间（分） "Expire": 1440, //jwt登录过期时间（分）
"RefreshTokenTime": 7200, //分钟 "RefreshTokenTime": 30, //分钟
"TokenType": "Bearer" "TokenType": "Bearer"
}, },
"MainDb": "0", // 多租户主库配置ID "MainDb": "0", // 多租户主库配置ID