Skip to content

Commit

Permalink
feat: ✈️ change id to long
Browse files Browse the repository at this point in the history
  • Loading branch information
@anjoy8
anjoy8 committed Mar 30, 2023
1 parent d1288b1 commit 7b1f3a4
Show file tree
Hide file tree
Showing 37 changed files with 130 additions and 140 deletions.
5 changes: 0 additions & 5 deletions Blog.Core.Api/Blog.Core.Model.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Blog.Core.Api/Blog.Core.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions Blog.Core.Api/Controllers/DbFirst/MigrateController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public async Task<MessageModel<string>> DataMigrateFromOld2New()
InitPermissionTree(permissions, permissionsAllList, apiList);

var actionPermissionIds = permissionsAllList.Where(d => d.Id >= filterPermissionId).Select(d => d.Id).ToList();
List<int> filterPermissionIds = new();
List<long> filterPermissionIds = new();
FilterPermissionTree(permissionsAllList, actionPermissionIds, filterPermissionIds);
permissions = permissions.Where(d => filterPermissionIds.Contains(d.Id)).ToList();

Expand All @@ -93,10 +93,10 @@ public async Task<MessageModel<string>> DataMigrateFromOld2New()
// 1、保持菜单和接口
await SavePermissionTreeAsync(permissions, pms);

var rid = 0;
var pid = 0;
var mid = 0;
var rpmid = 0;
long rid = 0;
long pid = 0;
long mid = 0;
long rpmid = 0;

// 2、保存关系表
foreach (var item in rmps)
Expand All @@ -116,8 +116,8 @@ public async Task<MessageModel<string>> DataMigrateFromOld2New()
}
}

pid = (pms.FirstOrDefault(d => d.PidOld == item.PermissionId)?.PidNew).ObjToInt();
mid = (pms.FirstOrDefault(d => d.MidOld == item.ModuleId)?.MidNew).ObjToInt();
pid = (pms.FirstOrDefault(d => d.PidOld == item.PermissionId)?.PidNew).ObjToLong();
mid = (pms.FirstOrDefault(d => d.MidOld == item.ModuleId)?.MidNew).ObjToLong();
// 关系
if (rid > 0 && pid > 0)
{
Expand Down Expand Up @@ -282,7 +282,7 @@ private void InitPermissionTree(List<Permission> permissionsTree, List<Permissio
}
}

private void FilterPermissionTree(List<Permission> permissionsAll, List<int> actionPermissionId, List<int> filterPermissionIds)
private void FilterPermissionTree(List<Permission> permissionsAll, List<long> actionPermissionId, List<long> filterPermissionIds)
{
actionPermissionId = actionPermissionId.Distinct().ToList();
var doneIds = permissionsAll.Where(d => actionPermissionId.Contains(d.Id) && d.Pid == 0).Select(d => d.Id).ToList();
Expand All @@ -295,7 +295,7 @@ private void FilterPermissionTree(List<Permission> permissionsAll, List<int> act
}
}

private async Task SavePermissionTreeAsync(List<Permission> permissionsTree, List<PM> pms, int permissionId = 0)
private async Task SavePermissionTreeAsync(List<Permission> permissionsTree, List<PM> pms, long permissionId = 0)
{
var parendId = permissionId;

Expand All @@ -304,9 +304,9 @@ private async Task SavePermissionTreeAsync(List<Permission> permissionsTree, Lis
PM pm = new PM();
// 保留原始主键id
pm.PidOld = item.Id;
pm.MidOld = (item.Module?.Id).ObjToInt();
pm.MidOld = (item.Module?.Id).ObjToLong();

var mid = 0;
long mid = 0;
// 接口
if (item.Module != null)
{
Expand Down Expand Up @@ -351,9 +351,9 @@ private async Task SavePermissionTreeAsync(List<Permission> permissionsTree, Lis

public class PM
{
public int PidOld { get; set; }
public int MidOld { get; set; }
public int PidNew { get; set; }
public int MidNew { get; set; }
public long PidOld { get; set; }
public long MidOld { get; set; }
public long PidNew { get; set; }
public long MidNew { get; set; }
}
}
2 changes: 1 addition & 1 deletion Blog.Core.Api/Controllers/DepartmentController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public async Task<MessageModel<List<Department>>> GetTreeTable(long f = 0, strin

foreach (var item in departments)
{
List<int> pidarr = new() { };
List<long> pidarr = new() { };
var parent = departmentList.FirstOrDefault(d => d.Id == item.Pid);

while (parent != null)
Expand Down
24 changes: 12 additions & 12 deletions Blog.Core.Api/Controllers/PermissionController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public async Task<MessageModel<PageModel<Permission>>> Get(int page = 1, string
var permissionAll = await _permissionServices.Query(d => d.IsDeleted != true);
foreach (var item in permissionsView)
{
List<int> pidarr = new List<int>
List<long> pidarr = new()
{
item.Pid
};
Expand Down Expand Up @@ -177,7 +177,7 @@ public async Task<MessageModel<List<Permission>>> GetTreeTable(int f = 0, string

foreach (var item in permissions)
{
List<int> pidarr = new List<int> { };
List<long> pidarr = new() { };
var parent = permissionsList.FirstOrDefault(d => d.Id == item.Pid);

while (parent != null)
Expand Down Expand Up @@ -353,13 +353,13 @@ orderby child.Id
/// <param name="uid"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<NavigationBar>> GetNavigationBar(int uid)
public async Task<MessageModel<NavigationBar>> GetNavigationBar(long uid)
{

var data = new MessageModel<NavigationBar>();

var uidInHttpcontext1 = 0;
var roleIds = new List<int>();
var roleIds = new List<long>();
// ids4和jwt切换
if (Permissions.IsUseIds4)
{
Expand All @@ -369,21 +369,21 @@ public async Task<MessageModel<NavigationBar>> GetNavigationBar(int uid)
select item.Value).FirstOrDefault().ObjToInt();
roleIds = (from item in _httpContext.HttpContext.User.Claims
where item.Type == "role"
select item.Value.ObjToInt()).ToList();
select item.Value.ObjToLong()).ToList();
}
else
{
// jwt
uidInHttpcontext1 = ((JwtHelper.SerializeJwt(_httpContext.HttpContext.Request.Headers["Authorization"].ObjToString().Replace("Bearer ", "")))?.Uid).ObjToInt();
roleIds = (await _userRoleServices.Query(d => d.IsDeleted == false && d.UserId == uid)).Select(d => d.RoleId.ObjToInt()).Distinct().ToList();
roleIds = (await _userRoleServices.Query(d => d.IsDeleted == false && d.UserId == uid)).Select(d => d.RoleId.ObjToLong()).Distinct().ToList();
}


if (uid > 0 && uid == uidInHttpcontext1)
{
if (roleIds.Any())
{
var pids = (await _roleModulePermissionServices.Query(d => d.IsDeleted == false && roleIds.Contains(d.RoleId))).Select(d => d.PermissionId.ObjToInt()).Distinct();
var pids = (await _roleModulePermissionServices.Query(d => d.IsDeleted == false && roleIds.Contains(d.RoleId))).Select(d => d.PermissionId.ObjToLong()).Distinct();
if (pids.Any())
{
var rolePermissionMoudles = (await _permissionServices.Query(d => pids.Contains(d.Id))).OrderBy(c => c.OrderSort);
Expand Down Expand Up @@ -445,12 +445,12 @@ orderby child.Id
/// <param name="uid"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<List<NavigationBarPro>>> GetNavigationBarPro(int uid)
public async Task<MessageModel<List<NavigationBarPro>>> GetNavigationBarPro(long uid)
{
var data = new MessageModel<List<NavigationBarPro>>();

var uidInHttpcontext1 = 0;
var roleIds = new List<int>();
var roleIds = new List<long>();
// ids4和jwt切换
if (Permissions.IsUseIds4)
{
Expand All @@ -460,21 +460,21 @@ public async Task<MessageModel<List<NavigationBarPro>>> GetNavigationBarPro(int
select item.Value).FirstOrDefault().ObjToInt();
roleIds = (from item in _httpContext.HttpContext.User.Claims
where item.Type == "role"
select item.Value.ObjToInt()).ToList();
select item.Value.ObjToLong()).ToList();
}
else
{
// jwt
uidInHttpcontext1 = ((JwtHelper.SerializeJwt(_httpContext.HttpContext.Request.Headers["Authorization"].ObjToString().Replace("Bearer ", "")))?.Uid).ObjToInt();
roleIds = (await _userRoleServices.Query(d => d.IsDeleted == false && d.UserId == uid)).Select(d => d.RoleId.ObjToInt()).Distinct().ToList();
roleIds = (await _userRoleServices.Query(d => d.IsDeleted == false && d.UserId == uid)).Select(d => d.RoleId.ObjToLong()).Distinct().ToList();
}

if (uid > 0 && uid == uidInHttpcontext1)
{
if (roleIds.Any())
{
var pids = (await _roleModulePermissionServices.Query(d => d.IsDeleted == false && roleIds.Contains(d.RoleId)))
.Select(d => d.PermissionId.ObjToInt()).Distinct();
.Select(d => d.PermissionId.ObjToLong()).Distinct();
if (pids.Any())
{
var rolePermissionMoudles = (await _permissionServices.Query(d => pids.Contains(d.Id) && d.IsButton == false)).OrderBy(c => c.OrderSort);
Expand Down
6 changes: 3 additions & 3 deletions Blog.Core.Api/Controllers/UserController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@ public async Task<MessageModel<PageModel<SysUserInfoDto>>> Get(int page = 1, str
return Success(data.ConvertTo<SysUserInfoDto>(_mapper));
}

private (string, List<int>) GetFullDepartmentName(List<Department> departments, int departmentId)
private (string, List<long>) GetFullDepartmentName(List<Department> departments, int departmentId)
{
var departmentModel = departments.FirstOrDefault(d => d.Id == departmentId);
if (departmentModel == null)
{
return ("", new List<int>());
return ("", new List<long>());
}

var pids = departmentModel.CodeRelationship?.TrimEnd(',').Split(',').Select(d => d.ObjToInt()).ToList();
var pids = departmentModel.CodeRelationship?.TrimEnd(',').Split(',').Select(d => d.ObjToLong()).ToList();
pids.Add(departmentModel.Id);
var pnams = departments.Where(d => pids.Contains(d.Id)).ToList().Select(d => d.Name).ToArray();
var fullName = string.Join("/", pnams);
Expand Down
44 changes: 22 additions & 22 deletions Blog.Core.Api/wwwroot/BlogCore.Data.json/Permission.tsv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2323,28 +2323,28 @@
"Pid": 94,
"Mid": 63
},
{
"Id": 114,
"Code": " ",
"Name": "推送文字消息",
"IsButton": 1,
"IsHide": 0,
"IskeepAlive": 0,
"Func": null,
"OrderSort": 0,
"Icon": null,
"Description": null,
"Enabled": 1,
"CreateId": 8,
"CreateBy": "test",
"CreateTime": "2020-04-23 16:22:11",
"ModifyId": null,
"ModifyBy": null,
"ModifyTime": "2021-09-29 00:00:00",
"IsDeleted": 0,
"Pid": 95,
"Mid": 0
},
//{
// "Id": 114,
// "Code": " ",
// "Name": "推送文字消息",
// "IsButton": 1,
// "IsHide": 0,
// "IskeepAlive": 0,
// "Func": null,
// "OrderSort": 0,
// "Icon": null,
// "Description": null,
// "Enabled": 1,
// "CreateId": 8,
// "CreateBy": "test",
// "CreateTime": "2020-04-23 16:22:11",
// "ModifyId": null,
// "ModifyBy": null,
// "ModifyTime": "2021-09-29 00:00:00",
// "IsDeleted": 0,
// "Pid": 95,
// "Mid": 0
//},
{
"Code": "-",
"Name": "部门权限管理",
Expand Down
12 changes: 6 additions & 6 deletions Blog.Core.Api/wwwroot/BlogCore.Data.json/RoleModulePermission.tsv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1647,7 +1647,7 @@
"ModifyId": null,
"ModifyBy": null,
"ModifyTime": "\/Date(1546272000000+0800)\/",
"Id": 128
"Id": 228
},
{
"IsDeleted": false,
Expand All @@ -1658,7 +1658,7 @@
"RoleId": 6,
"ModuleId": 0,
"PermissionId": 114,
"Id": 129
"Id": 229
},
{
"IsDeleted": false,
Expand All @@ -1669,7 +1669,7 @@
"RoleId": 6,
"ModuleId": 66,
"PermissionId": 115,
"Id": 130
"Id": 230
},
{
"IsDeleted": false,
Expand All @@ -1680,7 +1680,7 @@
"RoleId": 6,
"ModuleId": 70,
"PermissionId": 120,
"Id": 131
"Id": 231
},
{
"IsDeleted": false,
Expand All @@ -1691,7 +1691,7 @@
"RoleId": 6,
"ModuleId": 66,
"PermissionId": 116,
"Id": 132
"Id": 232
},
{
"IsDeleted": false,
Expand All @@ -1702,6 +1702,6 @@
"RoleId": 4,
"ModuleId": 72,
"PermissionId": 122,
"Id": 133
"Id": 233
}
]
10 changes: 9 additions & 1 deletion Blog.Core.Common/DB/Aop/SqlsugarAop.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Blog.Core.Model.Models.RootTkey;
using Blog.Core.Model;
using Blog.Core.Model.Models.RootTkey;
using Blog.Core.Model.Tenants;
using SqlSugar;
using System;
Expand All @@ -16,6 +17,13 @@ public static void DataExecuting(object oldValue, DataFilterModel entityInfo)
root.Id = SnowFlakeSingle.Instance.NextId();
}
}
if (entityInfo.EntityValue is RootEntityTkey<long> rootEntity)
{
if (rootEntity.Id == 0)
{
rootEntity.Id = SnowFlakeSingle.Instance.NextId();
}
}

if (entityInfo.EntityValue is BaseEntity baseEntity)
{
Expand Down
12 changes: 6 additions & 6 deletions Blog.Core.Common/Helper/RecursionHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ public static void LoopToAppendChildrenT<T>(List<T> all, T curItem, string paren

public class PermissionTree
{
public int value { get; set; }
public int Pid { get; set; }
public long value { get; set; }
public long Pid { get; set; }
public string label { get; set; }
public int order { get; set; }
public bool isbtn { get; set; }
Expand All @@ -139,8 +139,8 @@ public class DepartmentTree

public class NavigationBar
{
public int id { get; set; }
public int pid { get; set; }
public long id { get; set; }
public long pid { get; set; }
public int order { get; set; }
public string name { get; set; }
public bool IsHide { get; set; } = false;
Expand All @@ -165,8 +165,8 @@ public class NavigationBarMeta

public class NavigationBarPro
{
public int id { get; set; }
public int parentId { get; set; }
public long id { get; set; }
public long parentId { get; set; }
public int order { get; set; }
public string name { get; set; }
public bool IsHide { get; set; } = false;
Expand Down
Loading

0 comments on commit 7b1f3a4

Please sign in to comment.