update

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-item.js

@@ -23,6 +23,12 @@ const schema = {
       type: "boolean",
       readOnly: true,
     },
+    heartBeat: {
+      title: "心跳",
+      type: "string",
+      input: "datetime",
+      readOnly: true,
+    },
   },
 };
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/JobHostdService.cs

@@ -85,14 +85,20 @@ public class JobHostdService : BackgroundService, IApplicationService
                                                 {
                                                     var jobItem = this.GetJobItem(job.Id);
                                                     Guid? jobLogId = null;
+                                                    if (jobItem.IsRunning && (DateTime.Now - jobItem.HeartBeat.Value).TotalSeconds > 20)
+                                                    {
+                                                        JobItemStop(jobItem.Id);
+                                                    }
                                                     if (!jobItem.IsRunning)
                                                     {
                                                         jobLogId = this.JobItemStart(job.Id);
-                                                        scope.ServiceProvider.GetRequiredService<IHubContext<PageHub>>().Clients.All.ServerToClient("JobItem", "refresh", "");
+                                                        using var timer = new System.Timers.Timer(10000);
                                                         if (jobLogId.HasValue)
                                                         {
                                                             try
                                                             {
+                                                                timer.Elapsed += (s, e) => JobItemHeartBeat(job.Id);
+                                                                scope.ServiceProvider.GetRequiredService<IHubContext<PageHub>>().Clients.All.ServerToClient("JobItem", "refresh", "");
                                                                 await jobService.Invoke(scope.ServiceProvider).ConfigureAwait(false);
                                                                 this.JobItemSuccess(job.Id, jobLogId.Value);
                                                                 Debug.WriteLine($"{job.Name} 定时任务执行成功");
@@ -103,7 +109,11 @@ public class JobHostdService : BackgroundService, IApplicationService
                                                                 Console.WriteLine(ex.ToString());
                                                                 this.JobItemFaild(job.Id, jobLogId.Value, ex);
                                                             }
-                                                            scope.ServiceProvider.GetRequiredService<IHubContext<PageHub>>().Clients.All.ServerToClient("JobItem", "refresh", "");
+                                                            finally
+                                                            {
+                                                                timer.Stop();
+                                                                scope.ServiceProvider.GetRequiredService<IHubContext<PageHub>>().Clients.All.ServerToClient("JobItem", "refresh", "");
+                                                            }
                                                         }
                                                     }
                                                 }
@@ -173,6 +183,21 @@ public class JobHostdService : BackgroundService, IApplicationService
         }
     }
 
+    private void JobItemStop(Guid id)
+    {
+        using var scope = this._serviceProvider.CreateScope();
+        var db = scope.ServiceProvider.GetRequiredService<SettleAccountDbContext>();
+        var entity = db.Set<JobItem>().FirstOrDefault(o => o.Id == id);
+        if (entity != null)
+        {
+            entity.IsRunning = false;
+            var log = db.Set<JobLog>().Where(o => o.JobId == id && o.End == null).OrderByDescending(o => o.Start).FirstOrDefault();
+            log.Success = false;
+            log.Exception = "心跳超时，自动停止";
+            db.SaveChanges();
+        }
+    }
+
     private Guid? JobItemStart(Guid id)
     {
         using var scope = this._serviceProvider.CreateScope();
@@ -181,6 +206,7 @@ public class JobHostdService : BackgroundService, IApplicationService
         if (entity != null)
         {
             entity.IsRunning = true;
+            entity.HeartBeat = DateTime.Now;
             var log = db.Set<JobLog>().Add(new JobLog { Start = DateTime.Now, JobId = entity.Id, Host = Dns.GetHostName() });
             db.SaveChanges();
             return log.Entity.Id;
@@ -194,6 +220,18 @@ public class JobHostdService : BackgroundService, IApplicationService
         return scope.ServiceProvider.GetRequiredService<SettleAccountDbContext>().Set<JobItem>().AsNoTracking().FirstOrDefault(o => o.Id == id);
     }
 
+    private void JobItemHeartBeat(Guid id)
+    {
+        using var scope = this._serviceProvider.CreateScope();
+        var db = scope.ServiceProvider.GetRequiredService<SettleAccountDbContext>();
+        var entity = db.Set<JobItem>().FirstOrDefault(o => o.Id == id);
+        if (entity != null)
+        {
+            entity.HeartBeat = DateTime.Now;
+            db.SaveChanges();
+        }
+    }
+
     public void RemoveJob(JobItem item)
     {
         lock (_lockObj)

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/JobItem.cs

@@ -23,6 +23,7 @@ public class JobItem : Entity<Guid>
     public string Service { get; set; }
 
     public bool IsRunning { get; set; }
+    public DateTime? HeartBeat { get; set; }
 
     [Timestamp]
     public string ConcurrencyStamp { get; set; }

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230807063408_vmi10.cs

@@ -0,0 +1,38 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+    public partial class vmi10 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "HeartBeat",
+                table: "Set_JobItem",
+                type: "datetime2",
+                nullable: true);
+
+            migrationBuilder.UpdateData(
+                table: "Set_VmiBalance",
+                keyColumn: "Id",
+                keyValue: new Guid("ea936b34-ecd0-7dbd-85a9-57cd8b730873"),
+                column: "ConcurrencyStamp",
+                value: "2cc9803a5a8e420b80134104653ecde0");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "HeartBeat",
+                table: "Set_JobItem");
+
+            migrationBuilder.UpdateData(
+                table: "Set_VmiBalance",
+                keyColumn: "Id",
+                keyValue: new Guid("ea936b34-ecd0-7dbd-85a9-57cd8b730873"),
+                column: "ConcurrencyStamp",
+                value: "887ca64c266c48ac82dca90534f64225");
+        }
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs

@@ -3886,6 +3886,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
+                    b.Property<DateTime?>("HeartBeat")
+                        .HasColumnType("datetime2");
+
                     b.Property<bool>("IsDisabled")
                         .HasColumnType("bit");
 
@@ -4040,7 +4043,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                             Id = new Guid("ea936b34-ecd0-7dbd-85a9-57cd8b730873"),
                             BillTime = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
                             BillType = 1,
-                            ConcurrencyStamp = "887ca64c266c48ac82dca90534f64225",
+                            ConcurrencyStamp = "2cc9803a5a8e420b80134104653ecde0",
                             DeliverTime = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
                             ErpToLoc = "ErpToLoc",
                             OrderNum = "OrderNum",