chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新定时任务配置

Browse Source
dev
嵇文龙 4 weeks ago
parent 754ff7edf9
commit 2853cb3edc
6 changed files with 60 additions and 38 deletions
Show Stats Download Patch File Download Diff File

1
ds-wms-service/DS.Module.Nuget/DS.Module.Nuget.csproj
Unescape Escape View File

@ -49,6 +49,7 @@
<PackageReference Include="NPOI" Version="2.7.0" />
<PackageReference Include="Npoi.Mapper" Version="6.2.1" />
<PackageReference Include="Quartz" Version="3.13.0" />
<PackageReference Include="Quartz.AspNetCore" Version="3.13.0" />
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.13.0" />
<PackageReference Include="RabbitMQ.Client" Version="6.5.0" />
<PackageReference Include="RazorEngineCore" Version="2024.4.1" />

6
ds-wms-service/DS.Module.Quartz/QuartzModuleInstall.cs
Unescape Escape View File

@ -3,6 +3,7 @@ using DS.WMS.Core.QuarztJobs;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Quartz;
using Quartz.AspNetCore;
namespace DS.Module.QuartzModuleInstall
{
@ -58,7 +59,7 @@ namespace DS.Module.QuartzModuleInstall
});
// 添加 Quartz 主机服务
services.AddQuartzHostedService(q => q.WaitForJobsToComplete = true);
services.AddQuartzServer(q => q.WaitForJobsToComplete = true);
}
public static void AddOpQuartzModuleInstall(this IServiceCollection services, IConfiguration configuration)
@ -76,8 +77,7 @@ namespace DS.Module.QuartzModuleInstall
);
});
// 添加 Quartz 主机服务
services.AddQuartzHostedService(q => q.WaitForJobsToComplete = true);
services.AddQuartzServer(q => q.WaitForJobsToComplete = true);
}
}
}

22
ds-wms-service/DS.WMS.Core/QuarztJobs/FeeCustTemplateJob.cs
Unescape Escape View File

@ -3,6 +3,7 @@ using DS.Module.Core;
using DS.WMS.Core.Sys.Entity;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Quartz;
using SqlSugar;
@ -16,6 +17,7 @@ namespace DS.WMS.Core.QuarztJobs
static readonly ApiFox api;
ISqlSugarClient? db;
IConfiguration configuration;
ILogger<FeeCustTemplateJob> logger;
static FeeCustTemplateJob()
{
@ -30,6 +32,7 @@ namespace DS.WMS.Core.QuarztJobs
{
db = serviceProvider.GetRequiredService<ISqlSugarClient>();
configuration = serviceProvider.GetRequiredService<IConfiguration>();
logger = serviceProvider.GetRequiredService<ILogger<FeeCustTemplateJob>>();
}
/// <summary>
@ -39,12 +42,14 @@ namespace DS.WMS.Core.QuarztJobs
/// <returns></returns>
public async Task Execute(IJobExecutionContext context)
{
logger.LogInformation("开始运行【自动费用模板】生成...");
db.QueryFilter.Clear();
var dbLinks = await db.Queryable<Module.SqlSugar.SysTenantLink>().ToListAsync();
foreach (var dbLink in dbLinks)
{
if (configuration["AutoFeeTemplate:Tenant"] != dbLink.TenantId.ToString())
continue;
//if (configuration["AutoFeeTemplate:Tenant"] != dbLink.TenantId.ToString())
// continue;
var adminUser = await db.Queryable<SysUser>()
.Where(x => x.TenantId == dbLink.TenantId && x.Status == 0 && x.UserType == 1)
@ -62,7 +67,7 @@ namespace DS.WMS.Core.QuarztJobs
if (adminUser == null)
{
Console.WriteLine($"未能获取租户系统管理员，租户ID：{dbLink.TenantId}");
logger.LogInformation("未能获取租户系统管理员，租户ID：" + dbLink.TenantId);
continue;
}
@ -85,7 +90,10 @@ namespace DS.WMS.Core.QuarztJobs
{
var baseUrl = configuration["AutoFeeTemplate:BaseUrl"];
if (string.IsNullOrEmpty(baseUrl))
throw new ApplicationException("未配置自动费用模板请求基础URL");
{
logger.LogInformation("未配置自动费用模板请求基础URL");
return;
}
api.BaseUri = new Uri(baseUrl, UriKind.Absolute);
}
@ -96,8 +104,10 @@ namespace DS.WMS.Core.QuarztJobs
etd = DateTime.Now.Date
});
if (!response.IsSuccessStatusCode)
throw new ApplicationException("自动费用模板生成费用失败，详情查看日志");
if (response.IsSuccessStatusCode)
logger.LogInformation("【自动费用模板】生成完成...");
else
logger.LogInformation($"【自动费用模板】生成失败（{response.ToString()}），详情查看日志！");
}
}
}

67
ds-wms-service/DS.WMS.Core/QuarztJobs/WSLReportJob.cs
Unescape Escape View File

@ -4,6 +4,7 @@ using DS.WMS.Core.Info.Entity;
using DS.WMS.Core.Op.Entity;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using MiniExcelLibs;
using Quartz;
using SqlSugar;
@ -20,6 +21,7 @@ namespace DS.WMS.Core.QuarztJobs
ISqlSugarClient? db;
Microsoft.Extensions.Configuration.IConfiguration config;
IWebHostEnvironment hostEnvironment;
ILogger<WSLReportJob> logger;
static WSLReportJob()
{
@ -35,10 +37,13 @@ namespace DS.WMS.Core.QuarztJobs
db = serviceProvider.GetRequiredService<ISqlSugarClient>();
config = serviceProvider.GetRequiredService<Microsoft.Extensions.Configuration.IConfiguration>();
hostEnvironment = serviceProvider.GetRequiredService<IWebHostEnvironment>();
logger = serviceProvider.GetRequiredService<ILogger<WSLReportJob>>();
}
public async Task Execute(IJobExecutionContext context)
{
logger.LogInformation("开始生成【WSL报表服务】...");
string path = Path.Combine(hostEnvironment.WebRootPath, "templates", "WSL.xlsx");
FileInfo templateFile = new(path);
if (!templateFile.Exists)
@ -84,7 +89,7 @@ namespace DS.WMS.Core.QuarztJobs
};
var list = await tenantDb.Queryable<SeaExport>().Where(x => x.SourceCode == SOURCE_CODE && SqlFunc.Between(x.ETD, startDate, endDate) && !x.Deleted)
.InnerJoin<InfoClient>((x, y) => x.CustomerId == y.Id)
.LeftJoin<InfoClient>((x, y) => x.CustomerId == y.Id)
.Select((x, y) => new
{
x.Id,
@ -95,33 +100,37 @@ namespace DS.WMS.Core.QuarztJobs
}).ToListAsync();
if (list.Count == 0)
return;
var ids = list.Select(x => x.Id.ToString());
var ctnList = await tenantDb.Queryable<OpCtn>().Where(x => ids.Contains(x.BSNO) &&
!SqlFunc.IsNullOrEmpty(x.CntrNo) && !SqlFunc.IsNullOrEmpty(x.SealNo) && !x.Deleted)
.Select(x => new
{
x.BSNO,
x.TEU
}).ToListAsync();
model.List = list.GroupBy(x => new { x.CustomerId, x.EnName }).Select(x => new WSLItem
{
CustomerId = x.Key.CustomerId,
CustomerName = x.Key.EnName,
Date = model.Date,
YesterdayTeu = x.Where(x => x.ETD >= yesterday && x.ETD <= yesterday).Sum(x => x.TEU),
TodayTeu = x.Where(x => x.ETD >= today && x.ETD <= today).Sum(x => x.TEU),
NextMonthTEU = x.Where(x => x.ETD.Value.Year == nextMonth.Year && x.ETD.Value.Month == nextMonth.Month).Sum(x => x.TEU),
LastMonthTEU = x.Where(x => x.ETD.Value.Year == lastMonth.Year && x.ETD.Value.Month == lastMonth.Month).Sum(x => x.TEU),
}).ToList();
foreach (var item in model.List)
{
var ids2 = list.Where(x => x.CustomerId == item.CustomerId).Select(x => x.Id.ToString());
item.TodayTeuCTNPickup = ctnList.Where(x => ids2.Contains(x.BSNO)).Sum(x => x.TEU);
model.List = [];
}
else
{
var ids = list.Select(x => x.Id.ToString());
var ctnList = await tenantDb.Queryable<OpCtn>().Where(x => ids.Contains(x.BSNO) &&
!SqlFunc.IsNullOrEmpty(x.CntrNo) && !SqlFunc.IsNullOrEmpty(x.SealNo) && !x.Deleted)
.Select(x => new
{
x.BSNO,
x.TEU
}).ToListAsync();
model.List = list.GroupBy(x => new { x.CustomerId, x.EnName }).Select(x => new WSLItem
{
CustomerId = x.Key.CustomerId,
CustomerName = x.Key.EnName,
Date = model.Date,
YesterdayTeu = x.Where(x => x.ETD >= yesterday && x.ETD <= yesterday).Sum(x => x.TEU),
TodayTeu = x.Where(x => x.ETD >= today && x.ETD <= today).Sum(x => x.TEU),
NextMonthTEU = x.Where(x => x.ETD.Value.Year == nextMonth.Year && x.ETD.Value.Month == nextMonth.Month).Sum(x => x.TEU),
LastMonthTEU = x.Where(x => x.ETD.Value.Year == lastMonth.Year && x.ETD.Value.Month == lastMonth.Month).Sum(x => x.TEU),
}).ToList();
foreach (var item in model.List)
{
var ids2 = list.Where(x => x.CustomerId == item.CustomerId).Select(x => x.Id.ToString());
item.TodayTeuCTNPickup = ctnList.Where(x => ids2.Contains(x.BSNO)).Sum(x => x.TEU);
}
}
MemoryStream ms = new();
await MiniExcel.SaveAsByTemplateAsync(ms, path, model);
@ -147,8 +156,10 @@ namespace DS.WMS.Core.QuarztJobs
}];
var mailResult = await api.SendRequestAsync(HttpMethod.Post, config["TaskMail:MailApiUrl"], mailParams);
if (!mailResult.IsSuccessStatusCode)
throw new ApplicationException("发送邮件失败");
if (mailResult.IsSuccessStatusCode)
logger.LogInformation("已发送【WSL报表服务】...");
else
logger.LogInformation("发送【WSL报表服务】失败！");
}
}
catch (Exception ex)

2
ds-wms-service/DS.WMS.OpApi/appsettings.json
Unescape Escape View File

@ -148,6 +148,6 @@
"FileType": [ ".xls", ".xlsx" ]
},
"JobConfig": {
"WSLReportJob": "0 0 1 * * ?"
"WSLReportJob": "0 0 17 * * ?"
}
}

BIN
ds-wms-service/DS.WMS.OpApi/wwwroot/templates/WSL.xlsx
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save