|
|
|
@ -1,4 +1,7 @@
|
|
|
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
|
|
|
using Furion;
|
|
|
|
|
using Furion.DataEncryption;
|
|
|
|
|
using Microsoft.AspNetCore.Http;
|
|
|
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
|
|
|
using Microsoft.Extensions.Hosting;
|
|
|
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
|
using Myshipping.Core.Entity;
|
|
|
|
@ -9,6 +12,7 @@ using RabbitMQ.Client.Events;
|
|
|
|
|
using System;
|
|
|
|
|
using System.Collections.Generic;
|
|
|
|
|
using System.Linq;
|
|
|
|
|
using System.Security.Claims;
|
|
|
|
|
using System.Text;
|
|
|
|
|
using System.Threading;
|
|
|
|
|
using System.Threading.Tasks;
|
|
|
|
@ -23,28 +27,36 @@ namespace Myshipping.Core.MQ
|
|
|
|
|
{
|
|
|
|
|
private readonly IServiceScopeFactory _scopeFactory;
|
|
|
|
|
private readonly IServiceScope _serviceScope;
|
|
|
|
|
|
|
|
|
|
private readonly ISysUserService _serviceUser;
|
|
|
|
|
private readonly ILogger<RecCompanyUserChangeService> _logger;
|
|
|
|
|
private readonly ISysTenantService _tenantService;
|
|
|
|
|
private readonly ISysUserService _userService;
|
|
|
|
|
private readonly SqlSugarRepository<SysUser> _sysUserRep;
|
|
|
|
|
private readonly SqlSugarRepository<SysTenant> _sysTenantRep;
|
|
|
|
|
|
|
|
|
|
private readonly SqlSugarRepository<SysOrg> _sysOrgRep;
|
|
|
|
|
private readonly SqlSugarRepository<SysPos> _sysPosRep;
|
|
|
|
|
private readonly SqlSugarRepository<SysRole> _sysRoleRep;
|
|
|
|
|
private readonly SqlSugarRepository<SysMenu> _sysMenuRep;
|
|
|
|
|
private readonly ISysRoleMenuService _sysRoleMenuService;
|
|
|
|
|
private IConnection mqConn;
|
|
|
|
|
private IModel model;
|
|
|
|
|
|
|
|
|
|
public RecCompanyUserChangeService(IServiceScopeFactory scopeFactory)
|
|
|
|
|
public RecCompanyUserChangeService(IServiceScopeFactory scopeFactory, ISysUserService serviceUser, ISysRoleMenuService sysRoleMenuService)
|
|
|
|
|
{
|
|
|
|
|
_scopeFactory = scopeFactory;
|
|
|
|
|
//通过这个注入DBContext
|
|
|
|
|
_serviceScope = _scopeFactory.CreateScope();
|
|
|
|
|
|
|
|
|
|
_serviceUser = serviceUser;
|
|
|
|
|
_sysRoleMenuService = sysRoleMenuService;
|
|
|
|
|
_logger = _serviceScope.ServiceProvider.GetService<ILogger<RecCompanyUserChangeService>>();
|
|
|
|
|
_tenantService = _serviceScope.ServiceProvider.GetService<ISysTenantService>();
|
|
|
|
|
_userService = _serviceScope.ServiceProvider.GetService<ISysUserService>();
|
|
|
|
|
_sysUserRep = _serviceScope.ServiceProvider.GetService<SqlSugarRepository<SysUser>>();
|
|
|
|
|
_sysTenantRep = _serviceScope.ServiceProvider.GetService<SqlSugarRepository<SysTenant>>();
|
|
|
|
|
|
|
|
|
|
_sysOrgRep = _serviceScope.ServiceProvider.GetService<SqlSugarRepository<SysOrg>>();
|
|
|
|
|
_sysPosRep = _serviceScope.ServiceProvider.GetService<SqlSugarRepository<SysPos>>();
|
|
|
|
|
_sysRoleRep = _serviceScope.ServiceProvider.GetService<SqlSugarRepository<SysRole>>();
|
|
|
|
|
_sysMenuRep = _serviceScope.ServiceProvider.GetService<SqlSugarRepository<SysMenu>>();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public override void Dispose()
|
|
|
|
@ -88,8 +100,29 @@ namespace Myshipping.Core.MQ
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void Consumer_Received(object ch, BasicDeliverEventArgs ea)
|
|
|
|
|
private async void Consumer_Received(object ch, BasicDeliverEventArgs ea)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
//授权---------- (用超级管理员的权限)
|
|
|
|
|
var httpContext = App.HttpContext;
|
|
|
|
|
var sysTenant = _sysTenantRep.AsQueryable().Filter(null, true).First(x => x.TenantType == TenantTypeEnum.SYSTEM);
|
|
|
|
|
var systemtenantid = sysTenant.Id;
|
|
|
|
|
var userauth = _sysUserRep.AsQueryable().Filter(null, true).First(x => x.Account == "superAdmin" && x.TenantId == systemtenantid);
|
|
|
|
|
|
|
|
|
|
ClaimsIdentity identity = new ClaimsIdentity("AuthenticationTypes.Federation");
|
|
|
|
|
identity.AddClaim(new Claim(type: ClaimConst.CLAINM_USERID, value: userauth.Id.ToString()));
|
|
|
|
|
identity.AddClaim(new Claim(type: ClaimConst.CLAINM_ACCOUNT, value: userauth.Account));
|
|
|
|
|
identity.AddClaim(new Claim(type: ClaimConst.CLAINM_NAME, value: userauth.Name));
|
|
|
|
|
identity.AddClaim(new Claim(type: ClaimConst.CLAINM_SUPERADMIN, value: ((int)userauth.AdminType).ToString()));
|
|
|
|
|
identity.AddClaim(new Claim(type: ClaimConst.CLAINM_TENANT_TYPE, value: sysTenant.TenantType.ToString()));
|
|
|
|
|
identity.AddClaim(new Claim(type: ClaimConst.TENANT_ID, value: sysTenant.Id.ToString()));
|
|
|
|
|
identity.AddClaim(new Claim(type: ClaimConst.TENANT_NAME, value: sysTenant.Name));
|
|
|
|
|
identity.AddClaim(new Claim(type: ClaimConst.DjyUserId, value: userauth.DjyUserId));
|
|
|
|
|
ClaimsPrincipal claimsPrincipal = new ClaimsPrincipal(identity);
|
|
|
|
|
httpContext.User = claimsPrincipal;
|
|
|
|
|
|
|
|
|
|
//-----
|
|
|
|
|
|
|
|
|
|
var body = ea.Body;
|
|
|
|
|
var strBody = Encoding.UTF8.GetString(body.ToArray());
|
|
|
|
|
|
|
|
|
@ -107,7 +140,7 @@ namespace Myshipping.Core.MQ
|
|
|
|
|
{
|
|
|
|
|
findTenant = _sysTenantRep.FirstOrDefault(x => x.Name == compname); //再根据公司全称查找
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (findTenant == null) //找不到,新建
|
|
|
|
|
{
|
|
|
|
|
var tenant = new SysTenant();
|
|
|
|
@ -116,25 +149,33 @@ namespace Myshipping.Core.MQ
|
|
|
|
|
tenant.AdminName = adminShowName;
|
|
|
|
|
tenant.Email = $"{tenant.Id}";
|
|
|
|
|
tenant.TenantType = TenantTypeEnum.COMMON;
|
|
|
|
|
var newTenant = _sysTenantRep.InsertReturnEntity(tenant);
|
|
|
|
|
_tenantService.InitNewTenant(tenant);
|
|
|
|
|
tenant.CompId = compid;
|
|
|
|
|
findTenant = _sysTenantRep.InsertReturnEntity(tenant);
|
|
|
|
|
await _tenantService.InitNewTenant(findTenant);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (type == "UserJoin") //用户加入公司
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else if (type == "UserJoin") //用户加入公司
|
|
|
|
|
{
|
|
|
|
|
var compId = jobj.GetStringValue("compId");
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else if (type == "UserLeave") //用户离职
|
|
|
|
|
{
|
|
|
|
|
var userId = jobj.GetJObjectValue("userId");
|
|
|
|
|
var compId = jobj.GetStringValue("compId");
|
|
|
|
|
//删除用户
|
|
|
|
|
_sysUserRep.Delete(x => x.DjyUserId == userId.ToString());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
else if (type == "CompanyUserSync") //公司及员工数据同步
|
|
|
|
|
{
|
|
|
|
|
/////同步租户
|
|
|
|
|
//----------同步租户
|
|
|
|
|
var comp = jobj.GetJObjectValue("company");
|
|
|
|
|
var compid = comp.GetStringValue("CompId");
|
|
|
|
|
var compname = comp.GetStringValue("CompName");
|
|
|
|
@ -155,35 +196,62 @@ namespace Myshipping.Core.MQ
|
|
|
|
|
tenant.AdminName = adminShowName;
|
|
|
|
|
tenant.Email = $"{tenant.Id}";
|
|
|
|
|
tenant.TenantType = TenantTypeEnum.COMMON;
|
|
|
|
|
tenant.CompId = compid;
|
|
|
|
|
findTenant = _sysTenantRep.InsertReturnEntity(tenant);
|
|
|
|
|
_tenantService.InitNewTenant(tenant);
|
|
|
|
|
await _tenantService.InitNewTenant(findTenant);
|
|
|
|
|
//新增的系统租户新增权限
|
|
|
|
|
GrantRoleMenuInput tenantmenuInput = new GrantRoleMenuInput();
|
|
|
|
|
tenantmenuInput.Id = findTenant.Id;
|
|
|
|
|
List<long> tenantGrantMenuIdList = new List<long>();
|
|
|
|
|
tenantGrantMenuIdList = _sysMenuRep.AsQueryable().Where(x => x.Pids.Contains("142307070910563")).Select(x => x.Id).ToList();//暂时写死默认新增权限管理
|
|
|
|
|
tenantmenuInput.GrantMenuIdList = tenantGrantMenuIdList;
|
|
|
|
|
await _sysRoleMenuService.GrantMenu(tenantmenuInput);
|
|
|
|
|
}
|
|
|
|
|
////同步用户
|
|
|
|
|
var user = jobj.GetJArrayValue("users");
|
|
|
|
|
///租户id
|
|
|
|
|
//----------
|
|
|
|
|
//同步用户
|
|
|
|
|
var user = jobj.GetJArrayValue("users");
|
|
|
|
|
//租户id
|
|
|
|
|
var tenantid = findTenant.Id;
|
|
|
|
|
foreach (var item in user)
|
|
|
|
|
var keyDES = App.GetOptions<EncryptKeyOptions>().DES;
|
|
|
|
|
foreach (JObject item in user)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var GID = item.GetStringValue("GID");
|
|
|
|
|
var Accont = item.GetStringValue("CODENAME");
|
|
|
|
|
var Name = item.GetStringValue("SHOWNAME");
|
|
|
|
|
var Pass = DESCEncryption.Encrypt(item.GetStringValue("PASSWORD"), keyDES);
|
|
|
|
|
var Email = item.GetStringValue("EMAIL1");
|
|
|
|
|
var Phone = item.GetStringValue("MOBILE");
|
|
|
|
|
var PassWord = item.GetStringValue("PASSWORD");
|
|
|
|
|
var Org = await _sysOrgRep.AsQueryable().Filter(null, true).Where(x => x.TenantId == tenantid && x.IsDeleted == false && x.Pid == 0).FirstAsync();
|
|
|
|
|
|
|
|
|
|
//------ 拼接对象调用新增用户接口
|
|
|
|
|
|
|
|
|
|
AddUserInput adduser = new AddUserInput();
|
|
|
|
|
adduser.Account = Accont;
|
|
|
|
|
adduser.Password = PassWord;
|
|
|
|
|
adduser.Confirm = PassWord;
|
|
|
|
|
adduser.Sex = 1;
|
|
|
|
|
adduser.Phone = Phone;
|
|
|
|
|
adduser.TenantId = tenantid;
|
|
|
|
|
EmpOutput2 empOutput2 = new EmpOutput2();
|
|
|
|
|
empOutput2.OrgId = Org.Id.ToString();
|
|
|
|
|
empOutput2.OrgName = Org.Name;
|
|
|
|
|
List<long> PosIdList = new List<long>();
|
|
|
|
|
var pos = _sysPosRep.AsQueryable().Filter(null, true).Where(x => x.TenantId == tenantid && x.IsDeleted == false).FirstAsync();
|
|
|
|
|
PosIdList.Add(pos.Id);
|
|
|
|
|
empOutput2.PosIdList = PosIdList;
|
|
|
|
|
adduser.SysEmpParam = empOutput2;
|
|
|
|
|
await _serviceUser.AddUser(adduser, true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//-----授权角色id普通用户
|
|
|
|
|
var role = _sysRoleRep.AsQueryable().Filter(null, true).Where(x => x.TenantId == tenantid && x.Name == "普通用户").FirstAsync();
|
|
|
|
|
GrantRoleMenuInput menuInput = new GrantRoleMenuInput();
|
|
|
|
|
menuInput.Id = Convert.ToInt64(role.Id);
|
|
|
|
|
List<long> GrantMenuIdList = new List<long>();
|
|
|
|
|
GrantMenuIdList.Add(351064299098181);//暂时写死 ,后续从字典获取 新增订舱台账
|
|
|
|
|
menuInput.GrantMenuIdList = GrantMenuIdList;
|
|
|
|
|
await _sysRoleMenuService.GrantMenu(menuInput);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
_logger.LogInformation($"收到消息:{strBody}");
|
|
|
|
|