ef6b3255
杨鑫
修改BUG
|
1
2
|
using System.Text.Json;
using FoodLabeling.Application.Contracts.Constants;
|
143afd59
杨鑫
打印,标签
|
3
|
using FoodLabeling.Application.Helpers;
|
07d5dea2
李曜臣
5-18代码优化
|
4
|
using FoodLabeling.Application.Contracts.Dtos.RbacRole;
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
5
6
|
using FoodLabeling.Application.Contracts.Dtos.Common;
using FoodLabeling.Application.Contracts.IServices;
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Volo.Abp;
using Volo.Abp.Application.Services;
using Volo.Abp.Domain.Entities;
using Volo.Abp.Uow;
using Yi.Framework.Rbac.Domain.Entities;
using Yi.Framework.SqlSugarCore.Abstractions;
namespace FoodLabeling.Application.Services;
/// <summary>
/// 角色管理(食品标签-美国版对外)
/// </summary>
public class RbacRoleAppService : ApplicationService, IRbacRoleAppService
{
|
dbc9750f
李曜臣
成员模块实现
|
23
|
private readonly ISqlSugarDbContext _dbContext;
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
24
|
private readonly ISqlSugarRepository<RoleAggregateRoot, Guid> _roleRepository;
|
10fd1324
李曜臣
5-17接口优化
|
25
|
private readonly ISqlSugarRepository<MenuAggregateRoot, Guid> _menuRepository;
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
26
27
28
29
30
|
private readonly ISqlSugarRepository<RoleMenuEntity> _roleMenuRepository;
private readonly ISqlSugarRepository<RoleDeptEntity> _roleDeptRepository;
private readonly ISqlSugarRepository<UserRoleEntity> _userRoleRepository;
public RbacRoleAppService(
|
dbc9750f
李曜臣
成员模块实现
|
31
|
ISqlSugarDbContext dbContext,
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
32
|
ISqlSugarRepository<RoleAggregateRoot, Guid> roleRepository,
|
10fd1324
李曜臣
5-17接口优化
|
33
|
ISqlSugarRepository<MenuAggregateRoot, Guid> menuRepository,
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
34
35
36
37
|
ISqlSugarRepository<RoleMenuEntity> roleMenuRepository,
ISqlSugarRepository<RoleDeptEntity> roleDeptRepository,
ISqlSugarRepository<UserRoleEntity> userRoleRepository)
{
|
dbc9750f
李曜臣
成员模块实现
|
38
|
_dbContext = dbContext;
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
39
|
_roleRepository = roleRepository;
|
10fd1324
李曜臣
5-17接口优化
|
40
|
_menuRepository = menuRepository;
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
_roleMenuRepository = roleMenuRepository;
_roleDeptRepository = roleDeptRepository;
_userRoleRepository = userRoleRepository;
}
/// <inheritdoc />
public async Task<PagedResultWithPageDto<RbacRoleGetListOutputDto>> GetListAsync([FromQuery] RbacRoleGetListInputVo input)
{
RefAsync<int> total = 0;
var query = _roleRepository._DbQueryable
.Where(x => x.IsDeleted == false)
.WhereIF(!string.IsNullOrWhiteSpace(input.RoleCode), x => x.RoleCode.Contains(input.RoleCode!.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.RoleName), x => x.RoleName.Contains(input.RoleName!.Trim()))
.WhereIF(input.State is not null, x => x.State == input.State);
if (!string.IsNullOrWhiteSpace(input.Sorting))
{
query = query.OrderBy(input.Sorting);
}
else
{
query = query.OrderBy(x => x.OrderNum, OrderByType.Desc);
}
var entities = await query.ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
var items = entities.Select(x => new RbacRoleGetListOutputDto
{
Id = x.Id,
RoleName = x.RoleName ?? string.Empty,
RoleCode = x.RoleCode ?? string.Empty,
Remark = x.Remark,
DataScope = (int)x.DataScope,
State = x.State,
|
ef6b3255
杨鑫
修改BUG
|
76
77
|
OrderNum = x.OrderNum,
AccessPermissionCodes = DeserializeAccessPermissionCodes(x.AccessPermissionCodesJson)
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
78
79
|
}).ToList();
|
10fd1324
李曜臣
5-17接口优化
|
80
81
|
await FillAccessPermissionsAsync(items);
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
82
|
var pageSize = input.MaxResultCount <= 0 ? items.Count : input.MaxResultCount;
|
143afd59
杨鑫
打印,标签
|
83
|
var pageIndex = pageSize <= 0 ? 1 : PagedQueryConvention.PageIndexFromSkipCount(input.SkipCount);
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
var totalPages = pageSize <= 0 ? 0 : (int)Math.Ceiling(total / (double)pageSize);
return new PagedResultWithPageDto<RbacRoleGetListOutputDto>
{
PageIndex = pageIndex,
PageSize = pageSize,
TotalCount = total,
TotalPages = totalPages,
Items = items
};
}
/// <inheritdoc />
public async Task<RbacRoleGetOutputDto> GetAsync(Guid id)
{
var entity = await _roleRepository.GetSingleAsync(x => x.Id == id && x.IsDeleted == false);
if (entity is null)
{
throw new UserFriendlyException("角色不存在");
}
|
07d5dea2
李曜臣
5-18代码优化
|
105
106
|
var menuIds = await _roleMenuRepository._DbQueryable
.Where(x => x.RoleId == id)
|
dbc9750f
李曜臣
成员模块实现
|
107
108
109
|
.Select(x => x.MenuId)
.ToListAsync();
|
10fd1324
李曜臣
5-17接口优化
|
110
|
var dto = new RbacRoleGetOutputDto
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
111
112
113
114
115
116
117
|
{
Id = entity.Id,
RoleName = entity.RoleName ?? string.Empty,
RoleCode = entity.RoleCode ?? string.Empty,
Remark = entity.Remark,
DataScope = (int)entity.DataScope,
State = entity.State,
|
dbc9750f
李曜臣
成员模块实现
|
118
|
OrderNum = entity.OrderNum,
|
ef6b3255
杨鑫
修改BUG
|
119
|
AccessPermissionCodes = DeserializeAccessPermissionCodes(entity.AccessPermissionCodesJson),
|
07d5dea2
李曜臣
5-18代码优化
|
120
|
MenuIds = menuIds.Select(x => x.ToString()).ToList()
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
121
|
};
|
10fd1324
李曜臣
5-17接口优化
|
122
123
|
await FillAccessPermissionsAsync(new List<RbacRoleGetListOutputDto> { dto });
return dto;
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
124
125
126
|
}
/// <inheritdoc />
|
10fd1324
李曜臣
5-17接口优化
|
127
|
[UnitOfWork]
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
|
public async Task<RbacRoleGetOutputDto> CreateAsync([FromBody] RbacRoleCreateInputVo input)
{
var roleName = input.RoleName?.Trim();
var roleCode = input.RoleCode?.Trim();
if (string.IsNullOrWhiteSpace(roleName))
{
throw new UserFriendlyException("角色名称不能为空");
}
if (string.IsNullOrWhiteSpace(roleCode))
{
throw new UserFriendlyException("角色编码不能为空");
}
var isExist = await _roleRepository.IsAnyAsync(x => x.RoleCode == roleCode || x.RoleName == roleName);
if (isExist)
{
throw new UserFriendlyException("角色名称或编码已存在");
}
var entity = new RoleAggregateRoot
{
RoleName = roleName,
RoleCode = roleCode,
Remark = input.Remark?.Trim(),
DataScope = (Yi.Framework.Rbac.Domain.Shared.Enums.DataScopeEnum)input.DataScope,
State = input.State,
|
10fd1324
李曜臣
5-17接口优化
|
155
|
OrderNum = input.OrderNum ?? 0
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
156
157
158
159
160
|
};
EntityHelper.TrySetId(entity, () => GuidGenerator.Create());
await _roleRepository.InsertAsync(entity);
|
10fd1324
李曜臣
5-17接口优化
|
161
162
|
await ApplyRoleMenuBindingsAsync(entity.Id, input);
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
163
164
165
166
|
return await GetAsync(entity.Id);
}
/// <inheritdoc />
|
10fd1324
李曜臣
5-17接口优化
|
167
|
[UnitOfWork]
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
|
public async Task<RbacRoleGetOutputDto> UpdateAsync(Guid id, [FromBody] RbacRoleUpdateInputVo input)
{
var entity = await _roleRepository.GetSingleAsync(x => x.Id == id && x.IsDeleted == false);
if (entity is null)
{
throw new UserFriendlyException("角色不存在");
}
var roleName = input.RoleName?.Trim();
var roleCode = input.RoleCode?.Trim();
if (string.IsNullOrWhiteSpace(roleName))
{
throw new UserFriendlyException("角色名称不能为空");
}
if (string.IsNullOrWhiteSpace(roleCode))
{
throw new UserFriendlyException("角色编码不能为空");
}
var isExist = await _roleRepository._DbQueryable
.Where(x => x.Id != entity.Id && x.IsDeleted == false)
.AnyAsync(x => x.RoleCode == roleCode || x.RoleName == roleName);
if (isExist)
{
throw new UserFriendlyException("角色名称或编码已存在");
}
entity.RoleName = roleName;
entity.RoleCode = roleCode;
entity.Remark = input.Remark?.Trim();
entity.DataScope = (Yi.Framework.Rbac.Domain.Shared.Enums.DataScopeEnum)input.DataScope;
entity.State = input.State;
|
10fd1324
李曜臣
5-17接口优化
|
201
202
203
204
|
if (input.OrderNum is not null)
{
entity.OrderNum = input.OrderNum.Value;
}
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
205
206
207
|
await _roleRepository.UpdateAsync(entity);
|
10fd1324
李曜臣
5-17接口优化
|
208
209
|
await ApplyRoleMenuBindingsAsync(entity.Id, input);
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
210
211
212
|
return await GetAsync(entity.Id);
}
|
10fd1324
李曜臣
5-17接口优化
|
213
|
/// <summary>
|
07d5dea2
李曜臣
5-18代码优化
|
214
|
/// 新增/编辑时按 menuIds 或 accessPermissions 绑定角色菜单(RoleMenu 表)。
|
10fd1324
李曜臣
5-17接口优化
|
215
216
217
|
/// </summary>
private async Task ApplyRoleMenuBindingsAsync(Guid roleId, RbacRoleCreateInputVo input)
{
|
07d5dea2
李曜臣
5-18代码优化
|
218
219
220
221
|
var hasMenuIds = input.MenuIds is not null;
var hasAccessPermissions = input.AccessPermissions is not null;
if (hasMenuIds && input.MenuIds!.Count > 0)
|
10fd1324
李曜臣
5-17接口优化
|
222
223
224
225
226
|
{
await SetRoleMenusAsync(roleId, input.MenuIds);
return;
}
|
07d5dea2
李曜臣
5-18代码优化
|
227
|
if (hasAccessPermissions)
|
10fd1324
李曜臣
5-17接口优化
|
228
|
{
|
07d5dea2
李曜臣
5-18代码优化
|
229
230
231
232
233
234
|
if (string.IsNullOrWhiteSpace(input.AccessPermissions))
{
await SetRoleMenusAsync(roleId, new List<Guid>());
return;
}
|
10fd1324
李曜臣
5-17接口优化
|
235
|
var menuIds = await ResolveMenuIdsFromAccessPermissionsAsync(input.AccessPermissions);
|
07d5dea2
李曜臣
5-18代码优化
|
236
237
238
239
240
241
|
if (menuIds.Count == 0)
{
throw new UserFriendlyException(
"accessPermissions 未匹配到任何菜单,请确认 PermissionCode 与菜单一致,或先执行 menu_backfill_permission_code.sql 回填 Menu.PermissionCode");
}
|
10fd1324
李曜臣
5-17接口优化
|
242
|
await SetRoleMenusAsync(roleId, menuIds);
|
07d5dea2
李曜臣
5-18代码优化
|
243
244
245
246
247
248
|
return;
}
if (hasMenuIds && input.MenuIds!.Count == 0)
{
await SetRoleMenusAsync(roleId, new List<Guid>());
|
10fd1324
李曜臣
5-17接口优化
|
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
|
}
}
private async Task SetRoleMenusAsync(Guid roleId, List<Guid> menuIds)
{
var distinct = menuIds?.Distinct().ToList() ?? new List<Guid>();
await _roleMenuRepository.DeleteAsync(x => x.RoleId == roleId);
if (distinct.Count == 0)
{
return;
}
var existMenuIds = await _menuRepository._DbQueryable
.Where(x => x.IsDeleted == false)
.Where(x => distinct.Contains(x.Id))
.Select(x => x.Id)
.ToListAsync();
if (existMenuIds.Count == 0)
{
return;
}
|
07d5dea2
李曜臣
5-18代码优化
|
273
|
var entities = existMenuIds.Select(menuId =>
|
10fd1324
李曜臣
5-17接口优化
|
274
|
{
|
07d5dea2
李曜臣
5-18代码优化
|
275
276
277
278
279
280
281
|
var entity = new RoleMenuEntity
{
RoleId = roleId,
MenuId = menuId
};
EntityHelper.TrySetId(entity, () => GuidGenerator.Create());
return entity;
|
10fd1324
李曜臣
5-17接口优化
|
282
283
284
285
286
287
288
|
}).ToList();
await _roleMenuRepository.InsertRangeAsync(entities);
}
private async Task<List<Guid>> ResolveMenuIdsFromAccessPermissionsAsync(string accessPermissions)
{
|
07d5dea2
李曜臣
5-18代码优化
|
289
|
var codes = RbacAccessPermissionHelper.ParseAccessPermissionCodes(accessPermissions);
|
10fd1324
李曜臣
5-17接口优化
|
290
291
292
293
294
|
if (codes.Count == 0)
{
return new List<Guid>();
}
|
07d5dea2
李曜臣
5-18代码优化
|
295
296
|
var codeSet = new HashSet<string>(codes, StringComparer.OrdinalIgnoreCase);
|
10fd1324
李曜臣
5-17接口优化
|
297
|
var menus = await _menuRepository._DbQueryable
|
07d5dea2
李曜臣
5-18代码优化
|
298
299
|
.Where(m => m.IsDeleted == false)
.Select(m => new { m.Id, m.PermissionCode, m.Router })
|
10fd1324
李曜臣
5-17接口优化
|
300
301
|
.ToListAsync();
|
07d5dea2
李曜臣
5-18代码优化
|
302
303
304
305
306
307
308
309
310
|
return menus
.Where(m =>
{
var effective = RbacAccessPermissionHelper.GetEffectivePermissionCode(m.PermissionCode, m.Router);
return effective is not null && codeSet.Contains(effective);
})
.Select(m => m.Id)
.Distinct()
.ToList();
|
10fd1324
李曜臣
5-17接口优化
|
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
|
}
private async Task FillAccessPermissionsAsync(List<RbacRoleGetListOutputDto> items)
{
if (items.Count == 0)
{
return;
}
var map = await GetAccessPermissionsByRoleIdsAsync(items.Select(x => x.Id).ToList());
foreach (var item in items)
{
item.AccessPermissions = map.GetValueOrDefault(item.Id, string.Empty);
}
}
/// <summary>
|
07d5dea2
李曜臣
5-18代码优化
|
328
|
/// Role → RoleMenu → Menu.PermissionCode(空则按 Router 推导)汇总 accessPermissions。
|
10fd1324
李曜臣
5-17接口优化
|
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
|
/// </summary>
private async Task<Dictionary<Guid, string>> GetAccessPermissionsByRoleIdsAsync(List<Guid> roleIds)
{
var result = roleIds.Distinct().ToDictionary(id => id, _ => string.Empty);
if (result.Count == 0)
{
return result;
}
var distinctRoleIds = result.Keys.ToList();
var links = await _roleMenuRepository._DbQueryable
.Where(rm => distinctRoleIds.Contains(rm.RoleId))
.Select(rm => new { rm.RoleId, rm.MenuId })
.ToListAsync();
if (links.Count == 0)
{
return result;
}
var menuIds = links.Select(x => x.MenuId).Distinct().ToList();
var menus = await _menuRepository._DbQueryable
.Where(m => menuIds.Contains(m.Id) && m.IsDeleted == false)
|
07d5dea2
李曜臣
5-18代码优化
|
351
|
.Select(m => new { m.Id, m.PermissionCode, m.Router })
|
10fd1324
李曜臣
5-17接口优化
|
352
|
.ToListAsync();
|
07d5dea2
李曜臣
5-18代码优化
|
353
354
355
|
var permByMenuId = menus.ToDictionary(
x => x.Id,
x => RbacAccessPermissionHelper.GetEffectivePermissionCode(x.PermissionCode, x.Router));
|
10fd1324
李曜臣
5-17接口优化
|
356
|
|
07d5dea2
李曜臣
5-18代码优化
|
357
|
var byRole = distinctRoleIds.ToDictionary(id => id, _ => new HashSet<string>(StringComparer.OrdinalIgnoreCase));
|
10fd1324
李曜臣
5-17接口优化
|
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
|
foreach (var link in links)
{
if (!permByMenuId.TryGetValue(link.MenuId, out var code) || string.IsNullOrWhiteSpace(code))
{
continue;
}
if (byRole.TryGetValue(link.RoleId, out var set))
{
set.Add(code.Trim());
}
}
foreach (var kv in byRole)
{
if (kv.Value.Count == 0)
{
continue;
}
result[kv.Key] = string.Join(", ", kv.Value.OrderBy(x => x, StringComparer.Ordinal));
}
return result;
}
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
384
385
386
387
388
389
390
391
392
393
394
395
396
397
|
/// <inheritdoc />
[UnitOfWork]
public async Task DeleteAsync([FromBody] List<Guid> ids)
{
var idList = ids?.Distinct().ToList() ?? new List<Guid>();
if (idList.Count == 0)
{
return;
}
await _roleMenuRepository.DeleteAsync(x => idList.Contains(x.RoleId));
await _roleDeptRepository.DeleteAsync(x => idList.Contains(x.RoleId));
await _userRoleRepository.DeleteAsync(x => idList.Contains(x.RoleId));
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
398
399
|
await _roleRepository.DeleteAsync(x => idList.Contains(x.Id));
}
|
ef6b3255
杨鑫
修改BUG
|
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
|
private static List<string> DeserializeAccessPermissionCodes(string? json)
{
if (string.IsNullOrWhiteSpace(json))
{
return new List<string>();
}
try
{
var raw = JsonSerializer.Deserialize<List<string>>(json);
return NormalizeAccessPermissionCodes(raw);
}
catch
{
return new List<string>();
}
}
private static string? SerializeAccessPermissionCodes(List<string> codes)
{
if (codes == null || codes.Count == 0)
{
return null;
}
return JsonSerializer.Serialize(codes);
}
private static List<string> ResolveAccessPermissions(RbacRoleCreateInputVo input)
{
var merged = new List<string>();
if (!string.IsNullOrWhiteSpace(input.AccessPermissions))
{
merged.AddRange(DeserializeAccessPermissionCodes(input.AccessPermissions));
}
if (input.AccessPermissionCodes is { Count: > 0 })
{
merged.AddRange(input.AccessPermissionCodes);
}
return NormalizeAccessPermissionCodes(merged.Count > 0 ? merged : null);
}
private static List<string> NormalizeAccessPermissionCodes(List<string>? input)
{
if (input == null || input.Count == 0)
{
return new List<string>();
}
return input
.Select(x => x?.Trim() ?? "")
.Where(x => x.Length > 0 && RoleAccessPermissionCodes.IsKnown(x))
.Distinct(StringComparer.Ordinal)
.ToList();
}
|
9df65e38
李曜臣
实现美国版门店与RBAC对外接口
|
458
|
}
|