优化常量设置&新增导入用户方法

This commit is contained in:
不做码农 2022-10-17 19:39:56 +08:00
parent 6c3efee19a
commit 65da2e3f2a
4 changed files with 59 additions and 2 deletions

View File

@ -128,7 +128,7 @@ namespace ZR.Admin.WebApi.Framework
var userData = jwtToken.FirstOrDefault(x => x.Type == ClaimTypes.UserData).Value; var userData = jwtToken.FirstOrDefault(x => x.Type == ClaimTypes.UserData).Value;
var loginUser = JsonConvert.DeserializeObject<LoginUser>(userData); var loginUser = JsonConvert.DeserializeObject<LoginUser>(userData);
var permissions = CacheService.GetUserPerms(GlobalConstant.UserPermKEY + loginUser?.UserId); var permissions = CacheService.GetUserPerms(GlobalConstant.UserPermKEY + loginUser?.UserId);
if (loginUser?.UserName == "admin") if (loginUser?.UserName == GlobalConstant.AdminRole)
{ {
permissions = new List<string>() { GlobalConstant.AdminPerm }; permissions = new List<string>() { GlobalConstant.AdminPerm };
} }

View File

@ -80,6 +80,19 @@ namespace ZR.Common
return false; return false;
} }
} }
public static bool CheckUserName(string str)
{
try
{
string rg = @"^[a-z][a-z0-9-_]*$";
return Regex.IsMatch(str, rg);
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
return false;
}
}
/// <summary> /// <summary>
/// 计算密码强度 /// 计算密码强度

View File

@ -222,7 +222,7 @@ namespace ZR.Service
{ {
var roleInfo = GetFirst(x => x.RoleId == roleid); var roleInfo = GetFirst(x => x.RoleId == roleid);
return roleInfo.RoleKey == "admin"; return roleInfo.RoleKey == GlobalConstant.AdminRole;
} }
/// <summary> /// <summary>

View File

@ -1,5 +1,6 @@
using Infrastructure; using Infrastructure;
using Infrastructure.Attribute; using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using System; using System;
using System.Collections; using System.Collections;
@ -221,5 +222,48 @@ namespace ZR.Service
//TODO 判断用户是否有数据权限 //TODO 判断用户是否有数据权限
} }
} }
/// <summary>
/// 导入数据
/// </summary>
/// <param name="users"></param>
/// <returns></returns>
public string ImportUsers(List<SysUser> users)
{
users.ForEach(x =>
{
x.Create_time = DateTime.Now;
x.Status = "0";
x.DelFlag = "0";
x.Password = "E10ADC3949BA59ABBE56E057F20F883E";
x.Remark = "数据导入";
});
var x = Context.Storageable(users)
.SplitInsert(it => !it.Any())
.SplitIgnore(it => it.Item.UserName == GlobalConstant.AdminRole)
.SplitError(x => x.Item.UserName.IsEmpty(), "用户名不能为空")
.SplitError(x => !Tools.CheckUserName(x.Item.UserName), "用户名不符合规范")
.WhereColumns(it => it.UserName)//如果不是主键可以这样实现多字段it=>new{it.x1,it.x2}
.ToStorage();
var result = x.AsInsertable.ExecuteCommand();//插入可插入部分;
string msg = string.Format(" 插入{0} 更新{1} 错误数据{2} 不计算数据{3} 删除数据{4},总共{5}",
x.InsertList.Count,
x.UpdateList.Count,
x.ErrorList.Count,
x.IgnoreList.Count,
x.DeleteList.Count,
x.TotalList.Count);
//输出统计
Console.WriteLine(msg);
//输出错误信息
foreach (var item in x.ErrorList)
{
Console.WriteLine("userName为" + item.Item.UserName + " : " + item.StorageMessage);
}
return msg;
}
} }
} }