liuwf 1 year ago
parent 259f2a2fe6
commit 6dff4bb3bb

@ -9,6 +9,7 @@ using Admin.Core.Service;
using Admin.Core.Tasks; using Admin.Core.Tasks;
using Aucma.Core.RunPlc; using Aucma.Core.RunPlc;
using Aucma.Core.Scanner; using Aucma.Core.Scanner;
using Aucma.Core.ScannerGun;
using Autofac; using Autofac;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
@ -64,6 +65,8 @@ namespace Aucma.Core.CodeBinding
//扫码器 //扫码器
services.AddScannerSetup(); services.AddScannerSetup();
// ɨÂëǹ
services.AddScannerGunSetup();
//任务调度 //任务调度
services.AddJobSetup(); services.AddJobSetup();
@ -89,7 +92,7 @@ namespace Aucma.Core.CodeBinding
/// </summary> /// </summary>
/// <param name="app"></param> /// <param name="app"></param>
/// <param name="env"></param> /// <param name="env"></param>
public void Configure(IApplicationBuilder app, IScannerService scannerService, IRunPlcService runPlcService, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter) // ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter public void Configure(IApplicationBuilder app, IScannerService scannerService, IScannerGunService scannerGunService, IRunPlcService runPlcService, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter) // ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter
{ {
// 使用静态文件 // 使用静态文件
app.UseStaticFiles(); app.UseStaticFiles();
@ -97,6 +100,9 @@ namespace Aucma.Core.CodeBinding
//app.UseAuthorization(); //app.UseAuthorization();
//开启扫码服务 //开启扫码服务
app.UseScannerMildd(scannerService); app.UseScannerMildd(scannerService);
//¿ªÆôɨÂëǹ·þÎñ
app.UseScannerGunMildd(scannerGunService);
// 开启QuartzNetJob调度服务 // 开启QuartzNetJob调度服务
app.UseQuartzJobMildd(tasksQzService, schedulerCenter); app.UseQuartzJobMildd(tasksQzService, schedulerCenter);
//PLC //PLC

@ -201,7 +201,7 @@
"Name": "扫码器2" "Name": "扫码器2"
}, },
"ScannerGun": { // "ScannerGun": { //
"Enabled": false "Enabled": true
} }
}, },
"PLCServer": [ "PLCServer": [

Loading…
Cancel
Save