Browse Source

配置swagger开关、任务计划开关、任务计划面板开关

master
wxd 2 years ago
parent
commit
427221e3b4
  1. 39
      src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs
  2. 99
      src/Shentun.Peis.HttpApi.Host/Schedulers/ChargeRequestInterfaceQueryWorker.cs
  3. 15
      src/Shentun.Peis.HttpApi.Host/Schedulers/ImportElectrocardiogramResultInterfaceWorker.cs
  4. 95
      src/Shentun.Peis.HttpApi.Host/Schedulers/ImportLisResultInterfaceWorker.cs
  5. 97
      src/Shentun.Peis.HttpApi.Host/Schedulers/ImportPacsResultInterfaceWorker.cs
  6. 92
      src/Shentun.Peis.HttpApi.Host/Schedulers/ImportPatientRegisterInterfaceWorker.cs
  7. 13
      src/Shentun.Peis.HttpApi.Host/Schedulers/SyncPatientRegisterReportInterfaceWorker.cs
  8. 9
      src/Shentun.Peis.HttpApi.Host/appsettings.json

39
src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs

@ -491,12 +491,16 @@ public class PeisHttpApiHostModule : AbpModule
app.UseErrorPage();
}
//配置是否启用任务面板
var IsEnabledDashboard = Convert.ToBoolean(configuration["Hangfire:IsEnabledDashboard"]);
app.UseHangfireDashboard("/hangfire", new DashboardOptions
if (IsEnabledDashboard)
{
Authorization = new[] { new CustomAuthorizeFilter() }
});
app.UseHangfireDashboard("/hangfire", new DashboardOptions
{
Authorization = new[] { new CustomAuthorizeFilter() }
});
}
app.UseCorrelationId();
@ -565,24 +569,29 @@ public class PeisHttpApiHostModule : AbpModule
//app.UseMiddleware(typeof(AuthorizationMiddlewareResultHandler));
//配置是否启用swagger
var IsSwagger = Convert.ToBoolean(configuration["Swagger:IsEnabled"]);
app.UseSwagger();
app.UseAbpSwaggerUI(c =>
if (IsSwagger)
{
app.UseSwagger();
app.UseAbpSwaggerUI(c =>
{
//c.SwaggerEndpoint("/swagger/v1/swagger.json", "Peis API");
c.SwaggerEndpoint($"/swagger/Work/swagger.json", "业务API"); //分组显示
c.SwaggerEndpoint($"/swagger/Sys/swagger.json", "底层API"); //分组显示
//c.SwaggerEndpoint("/swagger/v1/swagger.json", "Peis API");
c.SwaggerEndpoint($"/swagger/Work/swagger.json", "业务API"); //分组显示
c.SwaggerEndpoint($"/swagger/Sys/swagger.json", "底层API"); //分组显示
//c.RoutePrefix = string.Empty; // url 中不显示swagger
//c.RoutePrefix = string.Empty; // url 中不显示swagger
var configuration = context.ServiceProvider.GetRequiredService<IConfiguration>();
c.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
c.OAuthScopes("Peis");
var configuration = context.ServiceProvider.GetRequiredService<IConfiguration>();
c.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
c.OAuthScopes("Peis");
c.DefaultModelExpandDepth(-1);
});
c.DefaultModelExpandDepth(-1);
});
}
app.UseAuditing();
app.UseAbpSerilogEnrichers();

99
src/Shentun.Peis.HttpApi.Host/Schedulers/ChargeRequestInterfaceQueryWorker.cs

@ -25,59 +25,76 @@ namespace Shentun.Peis.Schedulers
private static long i;
private static bool _isRunning = false;
private static readonly object lockObject = new object();
private readonly IConfiguration _configuration;
public ChargeRequestInterfaceQueryWorker(IConfiguration configuration)
{
_configuration = configuration;
}
public virtual void DoWork(Guid interfaceId)
{
if (_isRunning) return;
//lock (lockObject)
//{
_isRunning = true;
try
_isRunning = true;
try
{
var backJobTypeIds = _configuration.GetSection("BackJobTypeId").Value;
//Logger.LogInformation("Executed" + GetType().Name + "..!");
var appServiceHelper = new AppServiceHelper();
//appServiceHelper.Login();
var thirdInterfaceDtos = appServiceHelper.CallAppService<object, List<ThirdInterfaceDto>>("api/app/ThirdInterface/GetList", null);
var thirdInterfaceDto = thirdInterfaceDtos.Where(o => o.Id == interfaceId).FirstOrDefault();
if (thirdInterfaceDto == null)
{
//Logger.LogInformation("Executed" + GetType().Name + "..!");
var appServiceHelper = new AppServiceHelper();
//appServiceHelper.Login();
var thirdInterfaceDtos = appServiceHelper.CallAppService<object, List<ThirdInterfaceDto>>("api/app/ThirdInterface/GetList", null);
var thirdInterfaceDto = thirdInterfaceDtos.Where(o => o.Id == interfaceId).FirstOrDefault();
if (thirdInterfaceDto == null)
{
_isRunning = false;
return;
}
if (thirdInterfaceDto.IsActive != 'Y')
_isRunning = false;
return;
}
if (!backJobTypeIds.Contains(thirdInterfaceDto.ThirdInterfaceType))
{
_isRunning = false;
return;
}
if (thirdInterfaceDto.IsActive != 'Y')
{
_isRunning = false;
return;
}
var parmValue = thirdInterfaceDto.ParmValue;
if (!string.IsNullOrWhiteSpace(parmValue))
{
var configurationBuilder = new ConfigurationBuilder()
.AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(parmValue)));
var interfaceConfig = configurationBuilder.Build();
var isActive = interfaceConfig.GetSection("Interface").GetSection("Scheduler")
.GetSection("IsActive").Value;
if (isActive != "Y")
{
_isRunning = false;
return;
}
var parmValue = thirdInterfaceDto.ParmValue;
if (!string.IsNullOrWhiteSpace(parmValue))
{
var configurationBuilder = new ConfigurationBuilder()
.AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(parmValue)));
var interfaceConfig = configurationBuilder.Build();
var isActive = interfaceConfig.GetSection("Interface").GetSection("Scheduler")
.GetSection("IsActive").Value;
if (isActive != "Y")
{
_isRunning = false;
return;
}
var assemblyName = interfaceConfig.GetSection("Interface").GetSection("AssemblyName").Value;
var className = interfaceConfig.GetSection("Interface").GetSection("ClassName").Value;
var funName = "DoWork";
object[] classConstructorArg = new object[] { thirdInterfaceDto.Id };
ReflectionHelper.Invoke(assemblyName, className, classConstructorArg, funName);
}
var assemblyName = interfaceConfig.GetSection("Interface").GetSection("AssemblyName").Value;
var className = interfaceConfig.GetSection("Interface").GetSection("ClassName").Value;
var funName = "DoWork";
object[] classConstructorArg = new object[] { thirdInterfaceDto.Id };
ReflectionHelper.Invoke(assemblyName, className, classConstructorArg, funName);
}
}
catch (Exception ex)
{
_isRunning = false;
Logger.LogError("Executed " + GetType().Name + " Error" + ex.Message);
}
}
catch (Exception ex)
{
_isRunning = false;
return;
Logger.LogError("Executed " + GetType().Name + " Error" + ex.Message);
}
_isRunning = false;
return;
//}
}
public void DoWork()
@ -91,6 +108,6 @@ namespace Shentun.Peis.Schedulers
return Task.CompletedTask;
}
//[DisableConcurrentExecution(timeoutInSeconds: 10 * 60)]
}
}

15
src/Shentun.Peis.HttpApi.Host/Schedulers/ImportElectrocardiogramResultInterfaceWorker.cs

@ -23,6 +23,12 @@ namespace Shentun.Peis.Schedulers
private static long i;
private static bool _isRunning = false;
private static readonly object lockObject = new object();
private readonly IConfiguration _configuration;
public ImportElectrocardiogramResultInterfaceWorker(IConfiguration configuration)
{
_configuration = configuration;
}
public virtual void DoWork(Guid interfaceId)
{
if (_isRunning) return;
@ -31,6 +37,8 @@ namespace Shentun.Peis.Schedulers
_isRunning = true;
try
{
var backJobTypeIds = _configuration.GetSection("BackJobTypeId").Value;
//Logger.LogInformation("Executed" + GetType().Name + "..!");
var appServiceHelper = new AppServiceHelper();
//appServiceHelper.Login();
@ -41,6 +49,13 @@ namespace Shentun.Peis.Schedulers
_isRunning = false;
return;
}
if (!backJobTypeIds.Contains(thirdInterfaceDto.ThirdInterfaceType))
{
_isRunning = false;
return;
}
if (thirdInterfaceDto.IsActive != 'Y')
{
_isRunning = false;

95
src/Shentun.Peis.HttpApi.Host/Schedulers/ImportLisResultInterfaceWorker.cs

@ -23,59 +23,74 @@ namespace Shentun.Peis.Schedulers
private static long i;
private static bool _isRunning = false;
private static readonly object lockObject = new object();
private readonly IConfiguration _configuration;
public ImportLisResultInterfaceWorker(IConfiguration configuration)
{
_configuration = configuration;
}
public virtual void DoWork(Guid interfaceId)
{
if (_isRunning) return;
//lock (lockObject)
//{
_isRunning = true;
try
_isRunning = true;
try
{
var backJobTypeIds = _configuration.GetSection("BackJobTypeId").Value;
//Logger.LogInformation("Executed" + GetType().Name + "..!");
var appServiceHelper = new AppServiceHelper();
//appServiceHelper.Login();
var thirdInterfaceDtos = appServiceHelper.CallAppService<object, List<ThirdInterfaceDto>>("api/app/ThirdInterface/GetList", null);
var thirdInterfaceDto = thirdInterfaceDtos.Where(o => o.Id == interfaceId).FirstOrDefault();
if (thirdInterfaceDto == null)
{
//Logger.LogInformation("Executed" + GetType().Name + "..!");
var appServiceHelper = new AppServiceHelper();
//appServiceHelper.Login();
var thirdInterfaceDtos = appServiceHelper.CallAppService<object, List<ThirdInterfaceDto>>("api/app/ThirdInterface/GetList", null);
var thirdInterfaceDto = thirdInterfaceDtos.Where(o => o.Id == interfaceId).FirstOrDefault();
if (thirdInterfaceDto == null)
{
_isRunning = false;
return;
}
if (thirdInterfaceDto.IsActive != 'Y')
_isRunning = false;
return;
}
if (!backJobTypeIds.Contains(thirdInterfaceDto.ThirdInterfaceType))
{
_isRunning = false;
return;
}
if (thirdInterfaceDto.IsActive != 'Y')
{
_isRunning = false;
return;
}
var parmValue = thirdInterfaceDto.ParmValue;
if (!string.IsNullOrWhiteSpace(parmValue))
{
var configurationBuilder = new ConfigurationBuilder()
.AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(parmValue)));
var interfaceConfig = configurationBuilder.Build();
var isActive = interfaceConfig.GetSection("Interface").GetSection("Scheduler")
.GetSection("IsActive").Value;
if (isActive != "Y")
{
_isRunning = false;
return;
}
var parmValue = thirdInterfaceDto.ParmValue;
if (!string.IsNullOrWhiteSpace(parmValue))
{
var configurationBuilder = new ConfigurationBuilder()
.AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(parmValue)));
var interfaceConfig = configurationBuilder.Build();
var isActive = interfaceConfig.GetSection("Interface").GetSection("Scheduler")
.GetSection("IsActive").Value;
if (isActive != "Y")
{
_isRunning = false;
return;
}
var assemblyName = interfaceConfig.GetSection("Interface").GetSection("AssemblyName").Value;
var className = interfaceConfig.GetSection("Interface").GetSection("ClassName").Value;
var funName = "DoWork";
object[] classConstructorArg = new object[] { thirdInterfaceDto.Id };
ReflectionHelper.Invoke(assemblyName, className, classConstructorArg, funName);
}
var assemblyName = interfaceConfig.GetSection("Interface").GetSection("AssemblyName").Value;
var className = interfaceConfig.GetSection("Interface").GetSection("ClassName").Value;
var funName = "DoWork";
object[] classConstructorArg = new object[] { thirdInterfaceDto.Id };
ReflectionHelper.Invoke(assemblyName, className, classConstructorArg, funName);
}
}
catch (Exception ex)
{
_isRunning = false;
Logger.LogError("Executed " + GetType().Name + " Error" + ex.Message);
}
}
catch (Exception ex)
{
_isRunning = false;
return;
Logger.LogError("Executed " + GetType().Name + " Error" + ex.Message);
}
_isRunning = false;
return;
//}
}
public void DoWork()

97
src/Shentun.Peis.HttpApi.Host/Schedulers/ImportPacsResultInterfaceWorker.cs

@ -23,59 +23,76 @@ namespace Shentun.Peis.Schedulers
private static long i;
private static bool _isRunning = false;
private static readonly object lockObject = new object();
private readonly IConfiguration _configuration;
public ImportPacsResultInterfaceWorker(IConfiguration configuration)
{
_configuration = configuration;
}
public virtual void DoWork(Guid interfaceId)
{
if (_isRunning) return;
//lock (lockObject)
//{
_isRunning = true;
try
_isRunning = true;
try
{
var backJobTypeIds = _configuration.GetSection("BackJobTypeId").Value;
//Logger.LogInformation("Executed" + GetType().Name + "..!");
var appServiceHelper = new AppServiceHelper();
//appServiceHelper.Login();
var thirdInterfaceDtos = appServiceHelper.CallAppService<object, List<ThirdInterfaceDto>>("api/app/ThirdInterface/GetList", null);
var thirdInterfaceDto = thirdInterfaceDtos.Where(o => o.Id == interfaceId).FirstOrDefault();
if (thirdInterfaceDto == null)
{
//Logger.LogInformation("Executed" + GetType().Name + "..!");
var appServiceHelper = new AppServiceHelper();
//appServiceHelper.Login();
var thirdInterfaceDtos = appServiceHelper.CallAppService<object, List<ThirdInterfaceDto>>("api/app/ThirdInterface/GetList", null);
var thirdInterfaceDto = thirdInterfaceDtos.Where(o => o.Id == interfaceId).FirstOrDefault();
if (thirdInterfaceDto == null)
{
_isRunning = false;
return;
}
if (thirdInterfaceDto.IsActive != 'Y')
_isRunning = false;
return;
}
if (!backJobTypeIds.Contains(thirdInterfaceDto.ThirdInterfaceType))
{
_isRunning = false;
return;
}
if (thirdInterfaceDto.IsActive != 'Y')
{
_isRunning = false;
return;
}
var parmValue = thirdInterfaceDto.ParmValue;
if (!string.IsNullOrWhiteSpace(parmValue))
{
var configurationBuilder = new ConfigurationBuilder()
.AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(parmValue)));
var interfaceConfig = configurationBuilder.Build();
var isActive = interfaceConfig.GetSection("Interface").GetSection("Scheduler")
.GetSection("IsActive").Value;
if (isActive != "Y")
{
_isRunning = false;
return;
}
var parmValue = thirdInterfaceDto.ParmValue;
if (!string.IsNullOrWhiteSpace(parmValue))
{
var configurationBuilder = new ConfigurationBuilder()
.AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(parmValue)));
var interfaceConfig = configurationBuilder.Build();
var isActive = interfaceConfig.GetSection("Interface").GetSection("Scheduler")
.GetSection("IsActive").Value;
if (isActive != "Y")
{
_isRunning = false;
return;
}
var assemblyName = interfaceConfig.GetSection("Interface").GetSection("AssemblyName").Value;
var className = interfaceConfig.GetSection("Interface").GetSection("ClassName").Value;
var funName = "DoWork";
object[] classConstructorArg = new object[] { thirdInterfaceDto.Id };
ReflectionHelper.Invoke(assemblyName, className, classConstructorArg, funName);
}
var assemblyName = interfaceConfig.GetSection("Interface").GetSection("AssemblyName").Value;
var className = interfaceConfig.GetSection("Interface").GetSection("ClassName").Value;
var funName = "DoWork";
object[] classConstructorArg = new object[] { thirdInterfaceDto.Id };
ReflectionHelper.Invoke(assemblyName, className, classConstructorArg, funName);
}
}
catch (Exception ex)
{
_isRunning = false;
Logger.LogError("Executed " + GetType().Name + " Error" + ex.Message);
}
}
catch (Exception ex)
{
_isRunning = false;
return;
Logger.LogError("Executed " + GetType().Name + " Error" + ex.Message);
}
_isRunning = false;
return;
//}
}

92
src/Shentun.Peis.HttpApi.Host/Schedulers/ImportPatientRegisterInterfaceWorker.cs

@ -19,58 +19,70 @@ namespace Shentun.Peis.Schedulers
private static long i;
private static bool _isRunning = false;
private static readonly object lockObject = new object();
private readonly IConfiguration _configuration;
public ImportPatientRegisterInterfaceWorker(IConfiguration configuration)
{
_configuration = configuration;
}
public virtual void DoWork(Guid interfaceId)
{
if (_isRunning) return;
//lock (lockObject)
//{
_isRunning = true;
try
_isRunning = true;
try
{
var backJobTypeIds = _configuration.GetSection("BackJobTypeId").Value;
//Logger.LogInformation("Executed" + GetType().Name + "..!");
var appServiceHelper = new AppServiceHelper();
//appServiceHelper.Login();
var thirdInterfaceDtos = appServiceHelper.CallAppService<object, List<ThirdInterfaceDto>>("api/app/ThirdInterface/GetList", null);
var thirdInterfaceDto = thirdInterfaceDtos.Where(o => o.Id == interfaceId).FirstOrDefault();
if (thirdInterfaceDto == null)
{
//Logger.LogInformation("Executed" + GetType().Name + "..!");
var appServiceHelper = new AppServiceHelper();
//appServiceHelper.Login();
var thirdInterfaceDtos = appServiceHelper.CallAppService<object, List<ThirdInterfaceDto>>("api/app/ThirdInterface/GetList", null);
var thirdInterfaceDto = thirdInterfaceDtos.Where(o => o.Id == interfaceId).FirstOrDefault();
if (thirdInterfaceDto == null)
{
_isRunning = false;
return;
}
if (thirdInterfaceDto.IsActive != 'Y')
_isRunning = false;
return;
}
if (!backJobTypeIds.Contains(thirdInterfaceDto.ThirdInterfaceType))
{
_isRunning = false;
return;
}
if (thirdInterfaceDto.IsActive != 'Y')
{
_isRunning = false;
return;
}
var parmValue = thirdInterfaceDto.ParmValue;
if (!string.IsNullOrWhiteSpace(parmValue))
{
var configurationBuilder = new ConfigurationBuilder()
.AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(parmValue)));
var interfaceConfig = configurationBuilder.Build();
var isActive = interfaceConfig.GetSection("Interface").GetSection("Scheduler")
.GetSection("IsActive").Value;
if (isActive != "Y")
{
_isRunning = false;
return;
}
var parmValue = thirdInterfaceDto.ParmValue;
if (!string.IsNullOrWhiteSpace(parmValue))
{
var configurationBuilder = new ConfigurationBuilder()
.AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(parmValue)));
var interfaceConfig = configurationBuilder.Build();
var isActive = interfaceConfig.GetSection("Interface").GetSection("Scheduler")
.GetSection("IsActive").Value;
if (isActive != "Y")
{
_isRunning = false;
return;
}
var assemblyName = interfaceConfig.GetSection("Interface").GetSection("AssemblyName").Value;
var className = interfaceConfig.GetSection("Interface").GetSection("ClassName").Value;
var funName = "DoWork";
object[] classConstructorArg = new object[] { thirdInterfaceDto.Id };
ReflectionHelper.Invoke(assemblyName, className, classConstructorArg, funName);
}
var assemblyName = interfaceConfig.GetSection("Interface").GetSection("AssemblyName").Value;
var className = interfaceConfig.GetSection("Interface").GetSection("ClassName").Value;
var funName = "DoWork";
object[] classConstructorArg = new object[] { thirdInterfaceDto.Id };
ReflectionHelper.Invoke(assemblyName, className, classConstructorArg, funName);
}
}
catch (Exception ex)
{
Logger.LogError("Executed " + GetType().Name + " Error" + ex.Message);
}
_isRunning = false;
return;
}
catch (Exception ex)
{
Logger.LogError("Executed " + GetType().Name + " Error" + ex.Message);
}
_isRunning = false;
return;
//}
}
public void DoWork()

13
src/Shentun.Peis.HttpApi.Host/Schedulers/SyncPatientRegisterReportInterfaceWorker.cs

@ -43,14 +43,17 @@ namespace Shentun.Peis.Schedulers
private readonly TransToWebPeisAppService _appService;
private readonly PrintReportAppService _printReportAppService;
private readonly IRepository<PatientRegister, Guid> _patientRegisterRepository;
private readonly IConfiguration _configuration;
public SyncPatientRegisterReportInterfaceWorker(
TransToWebPeisAppService appService,
IRepository<PatientRegister, Guid> patientRegisterRepository,
PrintReportAppService printReportAppService)
PrintReportAppService printReportAppService,
IConfiguration configuration)
{
_appService = appService;
_patientRegisterRepository = patientRegisterRepository;
_printReportAppService = printReportAppService;
_configuration = configuration;
}
public void DoWork(Guid interfaceId)
@ -61,6 +64,7 @@ namespace Shentun.Peis.Schedulers
_isRunning = true;
try
{
var backJobTypeIds = _configuration.GetSection("BackJobTypeId").Value;
//Logger.LogInformation("Executed" + GetType().Name + "..!");
var appServiceHelper = new AppServiceHelper();
appServiceHelper.Login();
@ -71,6 +75,11 @@ namespace Shentun.Peis.Schedulers
_isRunning = false;
return;
}
if (!backJobTypeIds.Contains(thirdInterfaceDto.ThirdInterfaceType))
{
_isRunning = false;
return;
}
if (thirdInterfaceDto.IsActive != 'Y')
{
_isRunning = false;
@ -146,7 +155,7 @@ namespace Shentun.Peis.Schedulers
Logger.LogError("无数据需要同步");
}
}

9
src/Shentun.Peis.HttpApi.Host/appsettings.json

@ -41,5 +41,12 @@
},
"AdminId": "3a11fe49-5719-0e9e-dd44-0c4aff0900b0",
//"AdminId": "3a0c4180-107c-0c89-b25b-0bd34666dcec",
"PeisReportPdfPath": "E:\\mypeis\\PeisReportPdf\\"
"PeisReportPdfPath": "E:\\mypeis\\PeisReportPdf\\",
"BackJobTypeId": "",
"Swagger": {
"IsEnabled": true
},
"Hangfire": {
"IsEnabledDashboard": true
}
}
Loading…
Cancel
Save