修复仪表盘三个bug：采集状态精确区分5种+暂停恢复、产量结算保留实时值、车间平均产量排除停用机床

frontend/src/views/dashboard/DashboardPage.vue

@@ -33,7 +33,7 @@
           <div class="stat-card">
             <div class="stat-label">
               采集服务
-              <el-tooltip content="数据采集服务的运行状态。服务每30秒向系统上报一次心跳，超过90秒未上报则判定为停止。" placement="top">
+              <el-tooltip content="数据采集服务的运行状态。点击暂停可暂停采集引擎，需手动启动/停止Windows服务。" placement="top">
                 <span class="info-icon">ⓘ</span>
               </el-tooltip>
             </div>
@@ -42,13 +42,14 @@
                 {{ collectorStatusText }}
               </el-tag>
             </div>
-            <div class="stat-sub" v-if="collectorStatus.serviceStatus === 'Running' && collectorStatus.status === 'running'">运行 {{ formatUptime(collectorStatus.uptimeSeconds) }}</div>
+            <div class="stat-sub" v-if="collectorStatus.status === 'running'">运行 {{ formatUptime(collectorStatus.uptimeSeconds) }}</div>
           </div>
             <div class="collector-actions">
-              <el-button v-if="collectorStatus.serviceStatus !== 'Running'" size="small" type="success" :loading="startLoading" @click="startCollector">启动采集</el-button>
-            <el-button v-if="collectorStatus.status === 'running'" size="small" type="danger" :loading="stopLoading" @click="stopCollector">停止采集</el-button>
-            <el-button size="small" type="warning" :loading="refreshLoading" @click="refreshCollectorConfig">刷新配置</el-button>
-          </div>
+              <el-button v-if="collectorStatus.status === 'stopped' || collectorStatus.status === 'not_installed'" size="small" type="success" disabled>需手动启动服务</el-button>
+              <el-button v-if="collectorStatus.status === 'paused' || collectorStatus.status === 'timeout'" size="small" type="success" :loading="startLoading" @click="startCollector">恢复采集</el-button>
+              <el-button v-if="collectorStatus.status === 'running'" size="small" type="danger" :loading="stopLoading" @click="stopCollector">暂停采集</el-button>
+              <el-button size="small" type="warning" :loading="refreshLoading" @click="refreshCollectorConfig">刷新配置</el-button>
+            </div>
         </el-card>
       </el-col>
       <el-col :span="6">
@@ -402,25 +403,25 @@ function formatNumber(val: number | undefined | null): string {
   return Number(val).toFixed(2)
 }
 
-// 采集服务状态：综合心跳 + Windows服务状态
+// 采集服务状态：5种精确状态
 const collectorTagType = computed(() => {
-  const { serviceStatus, status } = collectorStatus.value
-  if (serviceStatus === 'Running' && status === 'running') return 'success'
-  if (serviceStatus === 'Running' && status !== 'running') return 'warning' // 进程在但心跳超时
-  if (serviceStatus === 'NotInstalled') return 'danger'
-  if (serviceStatus === 'StartFailed') return 'danger'
+  const { status } = collectorStatus.value
+  if (status === 'running') return 'success'
+  if (status === 'paused') return 'info'
+  if (status === 'timeout') return 'warning'
+  if (status === 'stopped') return 'info'
+  if (status === 'not_installed') return 'danger'
   return 'warning'
 })
 
 const collectorStatusText = computed(() => {
-  const { serviceStatus, status } = collectorStatus.value
-  if (serviceStatus === 'Running' && status === 'running') return '运行中'
-  if (serviceStatus === 'Running' && status !== 'running') return '心跳超时'
-  if (serviceStatus === 'NotInstalled') return '未安装'
-  if (serviceStatus === 'Stopped') return '已停止'
-  if (serviceStatus === 'Starting') return '启动中'
-  if (serviceStatus === 'StartFailed') return '启动失败'
-  return serviceStatus || '-'
+  const { status } = collectorStatus.value
+  if (status === 'running') return '运行中'
+  if (status === 'paused') return '已暂停'
+  if (status === 'timeout') return '心跳超时'
+  if (status === 'stopped') return '已停止'
+  if (status === 'not_installed') return '未安装'
+  return status || '-'
 })
 
 function alertTypeTag(type: string): string {
@@ -443,7 +444,7 @@ function initWorkshopChart() {
         trigger: 'axis',
         formatter: (params: any) => {
           const d = workshopData.value[params[0].dataIndex]
-          return `${d.workshopName}<br/>${unitLabel}产量: ${params[0].value} ${unit}<br/>总产量: ${d.quantity} 件<br/>机床数: ${d.machineCount} 台`
+          return `${d.workshopName}<br/>${unitLabel}产量: ${Number(params[0].value).toFixed(2)} ${unit}<br/>总产量: ${d.quantity} 件<br/>机床数: ${d.machineCount} 台`
         },
       },
       grid: { left: 60, right: 20, top: 20, bottom: 30 },
@@ -452,7 +453,7 @@ function initWorkshopChart() {
       series: [{
         type: 'bar', data: workshopData.value.map(i => i.avgQuantity),
         itemStyle: { color: '#67C23A', borderRadius: [4, 4, 0, 0] }, barWidth: '40%',
-        label: { show: true, position: 'top', formatter: `{c} ${unit}`, fontSize: 12 },
+        label: { show: true, position: 'top', formatter: (p: any) => `${Number(p.value).toFixed(2)} ${unit}`, fontSize: 12 },
       }],
     })
   }

frontend/src/views/machine/MachineListPage.vue

@@ -48,7 +48,7 @@
       <el-table-column prop="ipAddress" label="IP地址" />
       <el-table-column label="在线状态" align="center">
         <template #default="{ row }">
-          <el-tag :type="row.isOnline ? 'success' : 'info'" size="small">{{ row.isOnline ? '在线' : '离线' }}</el-tag>
+          <el-tag :type="row.isOnline ? 'success' : 'info'" size="small">{{ row.isOnline ? '在线' : '离线' }}{{ row.lastPingLatency != null ? `-${row.lastPingLatency}ms` : '' }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center">

src/CncCollector/Core/CollectWorker.cs

@@ -216,6 +216,7 @@ namespace CncCollector.Core
 
         /// <summary>
         /// Ping每台机床的IP地址，更新各自的在线状态（并行执行）
+        /// 每台机床连续Ping 4次，取平均值作为延迟
         /// </summary>
         private void PingAllMachines()
         {
@@ -232,26 +233,32 @@ namespace CncCollector.Core
 
                 if (machines.Count == 0) return;
 
-                // 并行Ping所有机床（超时2秒/台）
-                var results = new ConcurrentDictionary<int, bool>();
+                // 并行Ping所有机床（每台4次取平均，超时2秒/次）
+                var results = new ConcurrentDictionary<int, int>(); // machineId → 平均延迟(ms)，-1表示离线
                 var tasks = machines.Select(m => Task.Run(() =>
                 {
-                    results[m.Id] = PingHost(m.Ip);
+                    results[m.Id] = PingHostAvg(m.Ip, 4);
                 })).ToArray();
-                Task.WaitAll(tasks, Math.Min(machines.Count * 3000, 30000));
+                Task.WaitAll(tasks, Math.Min(machines.Count * 12000, 120000));
 
-                // 按在线/离线分组批量更新
-                var onlineIds = results.Where(kv => kv.Value).Select(kv => kv.Key).ToList();
-                var offlineIds = results.Where(kv => !kv.Value).Select(kv => kv.Key).ToList();
+                // 按在线/离线分组
+                var onlineIds = results.Where(kv => kv.Value >= 0).Select(kv => kv.Key).ToList();
+                var offlineIds = results.Where(kv => kv.Value < 0).Select(kv => kv.Key).ToList();
 
                 using (var conn = new MySqlConnection(_businessConnStr))
                 {
-                    if (onlineIds.Count > 0)
-                        conn.Execute(@"UPDATE cnc_machine SET last_ping_time = NOW(), updated_at = NOW() WHERE id IN @Ids",
-                            new { Ids = onlineIds });
+                    // 只更新在线机床的 last_ping_time 和 last_ping_latency
+                    foreach (var kv in results.Where(kv => kv.Value >= 0))
+                    {
+                        conn.Execute(@"UPDATE cnc_machine SET last_ping_time = NOW(), last_ping_latency = @Latency, updated_at = NOW() WHERE id = @Id",
+                            new { Id = kv.Key, Latency = kv.Value });
+                    }
+                    // 离线机床：不更新 last_ping_time，保留上次延迟值
                     if (offlineIds.Count > 0)
-                        conn.Execute(@"UPDATE cnc_machine SET last_ping_time = NOW(), updated_at = NOW() WHERE id IN @Ids",
+                    {
+                        conn.Execute(@"UPDATE cnc_machine SET updated_at = NOW() WHERE id IN @Ids",
                             new { Ids = offlineIds });
+                    }
                 }
 
                 _log.Info($"Ping完成（地址={_address.Name}）：在线{onlineIds.Count}台，离线{offlineIds.Count}台");
@@ -263,22 +270,39 @@ namespace CncCollector.Core
         }
 
         /// <summary>
-        /// Ping指定主机地址（超时2秒）
+        /// Ping指定主机地址，连续ping count次取平均延迟(ms)。离线返回-1
         /// </summary>
-        private bool PingHost(string host)
+        private int PingHostAvg(string host, int count = 4)
         {
             try
             {
+                long totalMs = 0;
+                int successCount = 0;
                 using (var ping = new Ping())
                 {
-                    var reply = ping.Send(host, 2000);
-                    return reply.Status == IPStatus.Success;
+                    for (int i = 0; i < count; i++)
+                    {
+                        try
+                        {
+                            var reply = ping.Send(host, 2000);
+                            if (reply.Status == IPStatus.Success)
+                            {
+                                totalMs += reply.RoundtripTime;
+                                successCount++;
+                            }
+                        }
+                        catch
+                        {
+                            // 单次失败忽略
+                        }
+                    }
                 }
+                return successCount > 0 ? (int)(totalMs / successCount) : -1;
             }
             catch (Exception ex)
             {
                 _log.Debug($"Ping失败（主机={host}）: {ex.Message}");
-                return false;
+                return -1;
             }
         }
 

src/CncCollector/Core/ProductionTracker.cs

@@ -119,8 +119,11 @@ namespace CncCollector.Core
                 using (var conn = new MySqlConnection(_connectionString))
                 {
                     // 结账所有活跃段：is_settled=0 且 end_time IS NULL
+                    // 正确计算quantity：保留当前end_part_count，用end-start计算产量
                     conn.Execute(@"UPDATE cnc_production_segment 
-                        SET end_time = NOW(), end_part_count = start_part_count, quantity = 0, 
+                        SET end_time = NOW(), 
+                            end_part_count = COALESCE(end_part_count, start_part_count),
+                            quantity = GREATEST(0, COALESCE(end_part_count, start_part_count) - start_part_count), 
                             close_reason = @Reason, is_settled = 1, updated_at = NOW()
                         WHERE is_settled = 0 AND end_time IS NULL",
                         new { Reason = SegmentCloseReason.ServiceStop });

src/CncModels/Dto/Machine/MachineDetailResponse.cs

@@ -18,6 +18,8 @@ namespace CncModels.Dto.Machine
         public string IpAddress { get; set; }
         public bool IsEnabled { get; set; }
         public bool IsOnline { get; set; }
+        /// <summary>最近Ping延迟(ms)</summary>
+        public int? LastPingLatency { get; set; }
         public int? WorkerId { get; set; }
         public string WorkerName { get; set; }
         public string LastProgramName { get; set; }

src/CncModels/Dto/Machine/MachineListItem.cs

@@ -18,6 +18,8 @@ namespace CncModels.Dto.Machine
         public string IpAddress { get; set; }
         public bool IsEnabled { get; set; }
         public bool IsOnline { get; set; }
+        /// <summary>最近Ping延迟(ms)</summary>
+        public int? LastPingLatency { get; set; }
         public int? WorkerId { get; set; }
         public string WorkerName { get; set; }
         public string LastProgramName { get; set; }

src/CncModels/Entity/Machine.cs

@@ -34,6 +34,9 @@ namespace CncModels.Entity
         /// <summary>最近Ping时间（在线状态由 last_ping_time 实时计算）</summary>
         public DateTime? LastPingTime { get; set; }
 
+        /// <summary>最近Ping延迟(ms)，4次平均值</summary>
+        public int? LastPingLatency { get; set; }
+
         /// <summary>最近采集时间</summary>
         public DateTime? LastCollectTime { get; set; }
 

src/CncRepository/Impl/Dashboard/DashboardRepository.cs

@@ -44,12 +44,11 @@ namespace CncRepository.Impl.Dashboard
             ) all_days";
 
         /// <summary>汇总卡片数据</summary>
-        public DashboardSummaryResponse GetSummary(int onlineTimeout = 300)
+        public DashboardSummaryResponse GetSummary()
         {
             using (var conn = CreateConnection())
             {
-                var onlineCount = conn.ExecuteScalar<int>(@"SELECT COUNT(1) FROM cnc_machine WHERE is_enabled = 1 AND last_ping_time IS NOT NULL AND last_ping_time >= NOW() - INTERVAL @OnlineTimeout SECOND",
-                    new { OnlineTimeout = onlineTimeout });
+                var onlineCount = conn.ExecuteScalar<int>(@"SELECT COUNT(1) FROM cnc_machine WHERE is_enabled = 1 AND last_ping_time IS NOT NULL AND last_ping_time >= NOW() - INTERVAL 20 SECOND");
                 var totalMachines = conn.ExecuteScalar<int>(@"SELECT COUNT(1) FROM cnc_machine WHERE is_enabled = 1");
                 // 今日总产量：直接从产量分段实时计算（今日一定没有日终汇总）
                 var todayProduction = conn.ExecuteScalar<int>(@"
@@ -95,7 +94,7 @@ namespace CncRepository.Impl.Dashboard
                                ELSE COALESCE(SUM(ad.day_quantity), 0) / (DATEDIFF(@EndDate, @StartDate) + 1) / NULLIF(COUNT(DISTINCT m.id), 0)
                            END AS AvgQuantity
                     FROM cnc_workshop w
-                    LEFT JOIN cnc_machine m ON m.workshop_id = w.id
+                    LEFT JOIN cnc_machine m ON m.workshop_id = w.id AND m.is_enabled = 1
                     LEFT JOIN (
                         SELECT machine_id, production_date, day_quantity FROM (
                             SELECT dp.machine_id, dp.production_date, SUM(dp.total_quantity) AS day_quantity
@@ -121,7 +120,7 @@ namespace CncRepository.Impl.Dashboard
         }
 
         /// <summary>机床排行</summary>
-        public List<MachineRankResponse> GetMachineRank(DateTime startDate, DateTime endDate, int top, int onlineTimeout = 300, string sortOrder = "desc")
+        public List<MachineRankResponse> GetMachineRank(DateTime startDate, DateTime endDate, int top, string sortOrder = "desc")
         {
             // 排序方向白名单校验，防止SQL注入
             var orderBy = string.Equals(sortOrder, "asc", StringComparison.OrdinalIgnoreCase) ? "ASC" : "DESC";
@@ -131,7 +130,7 @@ namespace CncRepository.Impl.Dashboard
                     SELECT m.id AS MachineId,
                            m.name AS MachineName,
                            COALESCE(SUM(ad.day_quantity), 0) AS Quantity,
-                           (CASE WHEN m.is_enabled = 1 AND m.last_ping_time IS NOT NULL AND m.last_ping_time >= NOW() - INTERVAL @OnlineTimeout SECOND THEN 1 ELSE 0 END) AS Status,
+                           (CASE WHEN m.last_ping_time IS NOT NULL AND m.last_ping_time >= NOW() - INTERVAL 20 SECOND THEN 1 ELSE 0 END) AS Status,
                            (SELECT seg.program_name FROM cnc_production_segment seg
                             WHERE seg.machine_id = m.id AND seg.production_date = CURDATE()
                             ORDER BY seg.id DESC LIMIT 1) AS Program
@@ -158,7 +157,7 @@ namespace CncRepository.Impl.Dashboard
                     GROUP BY m.id, m.name, m.is_enabled, m.last_ping_time
                     ORDER BY Quantity {orderBy}
                     LIMIT @Top";
-                var rows = conn.Query<MachineRankResponse>(sql, new { StartDate = startDate, EndDate = endDate, Top = top, OnlineTimeout = onlineTimeout }).ToList();
+                var rows = conn.Query<MachineRankResponse>(sql, new { StartDate = startDate, EndDate = endDate, Top = top }).ToList();
                 // 填充排名
                 for (int i = 0; i < rows.Count; i++) rows[i].Rank = i + 1;
                 return rows;
@@ -239,14 +238,12 @@ namespace CncRepository.Impl.Dashboard
         }
 
         /// <summary>机床状态分布</summary>
-        public object GetMachineStatusDistribution(int onlineTimeout = 300)
+        public object GetMachineStatusDistribution()
         {
             using (var conn = CreateConnection())
             {
-                var online = conn.ExecuteScalar<int>("SELECT COUNT(1) FROM cnc_machine WHERE is_enabled = 1 AND last_ping_time IS NOT NULL AND last_ping_time >= NOW() - INTERVAL @OnlineTimeout SECOND",
-                    new { OnlineTimeout = onlineTimeout });
-                var offline = conn.ExecuteScalar<int>("SELECT COUNT(1) FROM cnc_machine WHERE is_enabled = 1 AND (last_ping_time IS NULL OR last_ping_time < NOW() - INTERVAL @OnlineTimeout SECOND)",
-                    new { OnlineTimeout = onlineTimeout });
+                var online = conn.ExecuteScalar<int>("SELECT COUNT(1) FROM cnc_machine WHERE is_enabled = 1 AND last_ping_time IS NOT NULL AND last_ping_time >= NOW() - INTERVAL 20 SECOND");
+                var offline = conn.ExecuteScalar<int>("SELECT COUNT(1) FROM cnc_machine WHERE is_enabled = 1 AND (last_ping_time IS NULL OR last_ping_time < NOW() - INTERVAL 20 SECOND)");
                 var disabled = conn.ExecuteScalar<int>("SELECT COUNT(1) FROM cnc_machine WHERE is_enabled = 0");
                 return new { online, offline, disabled };
             }

src/CncRepository/Impl/MachineRepository.cs

@@ -17,22 +17,22 @@ namespace CncRepository.Impl
         public MachineRepository(string connectionString) : base(connectionString) { }
 
         /// <summary>机床SELECT列映射模板（snake_case列名 → PascalCase属性名）</summary>
-        /// <summary>在线判断SQL片段：已启用且最近Ping在超时阈值内视为在线。参数 @OnlineTimeout</summary>
-        private const string OnlineExpr = "(CASE WHEN is_enabled = 1 AND last_ping_time IS NOT NULL AND last_ping_time >= NOW() - INTERVAL @OnlineTimeout SECOND THEN 1 ELSE 0 END)";
+        /// <summary>在线判断SQL片段：last_ping_time在20秒内视为在线</summary>
+        private const string OnlineExpr = "(CASE WHEN last_ping_time IS NOT NULL AND last_ping_time >= NOW() - INTERVAL 20 SECOND THEN 1 ELSE 0 END)";
 
-        private const string SelectColumns = @"id as Id, device_code as DeviceCode, name as Name, workshop_id as WorkshopId, collect_address_id as CollectAddressId, ip_address as IpAddress, brand_id as BrandId, is_enabled as IsEnabled, {0} as IsOnline, last_ping_time as LastPingTime, last_collect_time as LastCollectTime, last_device_status as LastDeviceStatus, last_run_status as LastRunStatus, last_program_name as LastProgramName, last_part_count as LastPartCount, last_operate_mode as LastOperateMode, last_machining_status as LastMachiningStatus, created_at as CreatedAt, updated_at as UpdatedAt";
+        private const string SelectColumns = @"id as Id, device_code as DeviceCode, name as Name, workshop_id as WorkshopId, collect_address_id as CollectAddressId, ip_address as IpAddress, brand_id as BrandId, is_enabled as IsEnabled, {0} as IsOnline, last_ping_time as LastPingTime, last_ping_latency as LastPingLatency, last_collect_time as LastCollectTime, last_device_status as LastDeviceStatus, last_run_status as LastRunStatus, last_program_name as LastProgramName, last_part_count as LastPartCount, last_operate_mode as LastOperateMode, last_machining_status as LastMachiningStatus, created_at as CreatedAt, updated_at as UpdatedAt";
 
-        public Machine GetById(int id, int onlineTimeout = 300)
+        public Machine GetById(int id)
         {
             using (var conn = CreateConnection())
             {
                 var cols = string.Format(SelectColumns, OnlineExpr);
                 var sql = $"SELECT {cols} FROM cnc_machine WHERE id = @Id";
-                return conn.QuerySingleOrDefault<Machine>(sql, new { Id = id, OnlineTimeout = onlineTimeout });
+                return conn.QuerySingleOrDefault<Machine>(sql, new { Id = id });
             }
         }
 
-        public MachineDetailResponse GetDetailById(int id, int onlineTimeout = 300)
+        public MachineDetailResponse GetDetailById(int id)
         {
             using (var conn = CreateConnection())
             {
@@ -42,7 +42,8 @@ namespace CncRepository.Impl
                             m.brand_id as BrandId, b.brand_name as BrandName, 
                             m.ip_address as IpAddress, 
                             m.is_enabled as IsEnabled, 
-                            (CASE WHEN m.is_enabled = 1 AND m.last_ping_time IS NOT NULL AND m.last_ping_time >= NOW() - INTERVAL @OnlineTimeout SECOND THEN 1 ELSE 0 END) as IsOnline, 
+                            (CASE WHEN m.last_ping_time IS NOT NULL AND m.last_ping_time >= NOW() - INTERVAL 20 SECOND THEN 1 ELSE 0 END) as IsOnline, 
+                            m.last_ping_latency as LastPingLatency,
                             w.id as WorkerId, w.name as WorkerName, 
                             m.last_program_name as LastProgramName, m.last_collect_time as LastCollectTime
                             FROM cnc_machine m 
@@ -51,17 +52,16 @@ namespace CncRepository.Impl
                             LEFT JOIN cnc_worker_machine wm ON m.id = wm.machine_id
                             LEFT JOIN cnc_worker w ON wm.worker_id = w.id
                             WHERE m.id = @Id";
-                return conn.QuerySingleOrDefault<MachineDetailResponse>(sql, new { Id = id, OnlineTimeout = onlineTimeout });
+                return conn.QuerySingleOrDefault<MachineDetailResponse>(sql, new { Id = id });
             }
         }
 
-        public PagedResult<MachineListItem> GetList(MachineQuery query, int onlineTimeout = 300)
+        public PagedResult<MachineListItem> GetList(MachineQuery query)
         {
             using (var conn = CreateConnection())
             {
                 var where = " WHERE 1=1";
                 var p = new DynamicParameters();
-                p.Add("OnlineTimeout", onlineTimeout);
                 if (!string.IsNullOrWhiteSpace(query.Keyword))
                 {
                     where += " AND (m.name LIKE @Keyword OR m.device_code LIKE @Keyword)";
@@ -75,9 +75,9 @@ namespace CncRepository.Impl
                 if (query.IsOnline.HasValue)
                 {
                     if (query.IsOnline.Value == 1)
-                        where += " AND m.is_enabled = 1 AND m.last_ping_time IS NOT NULL AND m.last_ping_time >= NOW() - INTERVAL @OnlineTimeout SECOND";
+                        where += " AND m.last_ping_time IS NOT NULL AND m.last_ping_time >= NOW() - INTERVAL 20 SECOND";
                     else
-                        where += " AND (m.is_enabled = 0 OR m.last_ping_time IS NULL OR m.last_ping_time < NOW() - INTERVAL @OnlineTimeout SECOND)";
+                        where += " AND (m.last_ping_time IS NULL OR m.last_ping_time < NOW() - INTERVAL 20 SECOND)";
                 }
                 if (query.BrandId.HasValue)
                 {
@@ -87,7 +87,8 @@ namespace CncRepository.Impl
                 var limit = query.PageSize;
                 var offset = query.Offset;
                 var sql = @"SELECT m.id as Id, m.device_code as DeviceCode, m.name as Name, m.workshop_id as WorkshopId, ws.name as WorkshopName, m.collect_address_id as CollectAddressId, m.brand_id as BrandId, b.brand_name as BrandName, m.ip_address as IpAddress, m.is_enabled as IsEnabled, 
-                            (CASE WHEN m.is_enabled = 1 AND m.last_ping_time IS NOT NULL AND m.last_ping_time >= NOW() - INTERVAL @OnlineTimeout SECOND THEN 1 ELSE 0 END) as IsOnline, 
+                            (CASE WHEN m.last_ping_time IS NOT NULL AND m.last_ping_time >= NOW() - INTERVAL 20 SECOND THEN 1 ELSE 0 END) as IsOnline, 
+                            m.last_ping_latency as LastPingLatency,
                             m.last_program_name as LastProgramName, m.last_collect_time as LastCollectTime, w.id as WorkerId, w.name as WorkerName 
                               FROM cnc_machine m 
                               LEFT JOIN cnc_workshop ws ON m.workshop_id = ws.id
@@ -157,33 +158,33 @@ namespace CncRepository.Impl
             }
         }
 
-        public Machine GetByDeviceCode(string deviceCode, int onlineTimeout = 300)
+        public Machine GetByDeviceCode(string deviceCode)
         {
             using (var conn = CreateConnection())
             {
                 var cols = string.Format(SelectColumns, OnlineExpr);
                 var sql = $"SELECT {cols} FROM cnc_machine WHERE device_code = @DeviceCode";
-                return conn.QuerySingleOrDefault<Machine>(sql, new { DeviceCode = deviceCode, OnlineTimeout = onlineTimeout });
+                return conn.QuerySingleOrDefault<Machine>(sql, new { DeviceCode = deviceCode });
             }
         }
 
-        public List<Machine> GetEnabledByAddressId(int collectAddressId, int onlineTimeout = 300)
+        public List<Machine> GetEnabledByAddressId(int collectAddressId)
         {
             using (var conn = CreateConnection())
             {
                 var cols = string.Format(SelectColumns, OnlineExpr);
                 var sql = $"SELECT {cols} FROM cnc_machine WHERE collect_address_id = @CollectAddressId AND is_enabled = 1";
-                return conn.Query<Machine>(sql, new { CollectAddressId = collectAddressId, OnlineTimeout = onlineTimeout }).ToList();
+                return conn.Query<Machine>(sql, new { CollectAddressId = collectAddressId }).ToList();
             }
         }
 
-        public List<Machine> GetEnabledOnline(int onlineTimeout = 300)
+        public List<Machine> GetEnabledOnline()
         {
             using (var conn = CreateConnection())
             {
                 var cols = string.Format(SelectColumns, OnlineExpr);
-                var sql = $"SELECT {cols} FROM cnc_machine WHERE is_enabled = 1 AND last_ping_time IS NOT NULL AND last_ping_time >= NOW() - INTERVAL @OnlineTimeout SECOND";
-                return conn.Query<Machine>(sql, new { OnlineTimeout = onlineTimeout }).ToList();
+                var sql = $"SELECT {cols} FROM cnc_machine WHERE is_enabled = 1 AND last_ping_time IS NOT NULL AND last_ping_time >= NOW() - INTERVAL 20 SECOND";
+                return conn.Query<Machine>(sql).ToList();
             }
         }
 

src/CncRepository/Interface/IDashboardRepository.cs

@@ -9,17 +9,17 @@ namespace CncRepository.Interface
     /// </summary>
     public interface IDashboardRepository
     {
-        DashboardSummaryResponse GetSummary(int onlineTimeout = 300);
+        DashboardSummaryResponse GetSummary();
 
         List<WorkshopProductionResponse> GetWorkshopProduction(DateTime startDate, DateTime endDate);
 
-        List<MachineRankResponse> GetMachineRank(DateTime startDate, DateTime endDate, int top, int onlineTimeout = 300, string sortOrder = "desc");
+        List<MachineRankResponse> GetMachineRank(DateTime startDate, DateTime endDate, int top, string sortOrder = "desc");
 
         List<WorkerRankResponse> GetWorkerRank(DateTime startDate, DateTime endDate, int top, string sortOrder = "desc");
 
         List<dynamic> GetProductionTrend(int days);
 
-        object GetMachineStatusDistribution(int onlineTimeout = 300);
+        object GetMachineStatusDistribution();
 
         List<AlertListItem> GetRecentAlerts(int count);
     }

src/CncRepository/Interface/IMachineRepository.cs

@@ -10,17 +10,17 @@ namespace CncRepository.Interface
     /// </summary>
     public interface IMachineRepository
     {
-        Machine GetById(int id, int onlineTimeout = 300);
-        MachineDetailResponse GetDetailById(int id, int onlineTimeout = 300);
-        PagedResult<MachineListItem> GetList(MachineQuery query, int onlineTimeout = 300);
+        Machine GetById(int id);
+        MachineDetailResponse GetDetailById(int id);
+        PagedResult<MachineListItem> GetList(MachineQuery query);
         int Create(Machine entity);
         bool Update(Machine entity);
         bool Delete(int id);
         int BatchDelete(List<int> ids);
         bool ToggleEnabled(int id);
-        Machine GetByDeviceCode(string deviceCode, int onlineTimeout = 300);
-        List<Machine> GetEnabledByAddressId(int collectAddressId, int onlineTimeout = 300);
-        List<Machine> GetEnabledOnline(int onlineTimeout = 300);
+        Machine GetByDeviceCode(string deviceCode);
+        List<Machine> GetEnabledByAddressId(int collectAddressId);
+        List<Machine> GetEnabledOnline();
         void UpdateLastCollect(int id, Machine entity);
         /// <summary>设置机床所属的采集地址</summary>
         void SetCollectAddress(int machineId, int? collectAddressId);

src/CncService/Impl/DashboardService.cs

@@ -27,18 +27,10 @@ namespace CncService.Impl
             _serviceChecker = serviceChecker;
         }
 
-        /// <summary>从sys_config读取online_timeout，默认300秒</summary>
-        private int GetOnlineTimeout()
-        {
-            var cfg = _sysConfigRepository.GetByKey("online_timeout");
-            if (cfg != null && int.TryParse(cfg.ConfigValue, out var val) && val > 0) return val;
-            return 300;
-        }
-
         /// <inheritdoc/>
         public DashboardSummaryResponse GetSummary()
         {
-            return _dashboardRepository.GetSummary(GetOnlineTimeout());
+            return _dashboardRepository.GetSummary();
         }
 
         /// <inheritdoc/>
@@ -54,7 +46,7 @@ namespace CncService.Impl
         {
             var s = startDate ?? DateTime.Today;
             var e = endDate ?? DateTime.Today;
-            return _dashboardRepository.GetMachineRank(s, e, top, GetOnlineTimeout(), sortOrder);
+            return _dashboardRepository.GetMachineRank(s, e, top, sortOrder);
         }
 
         /// <inheritdoc/>
@@ -74,7 +66,7 @@ namespace CncService.Impl
         /// <inheritdoc/>
         public object GetMachineStatusDistribution()
         {
-            return _dashboardRepository.GetMachineStatusDistribution(GetOnlineTimeout());
+            return _dashboardRepository.GetMachineStatusDistribution();
         }
 
         /// <inheritdoc/>
@@ -83,12 +75,20 @@ namespace CncService.Impl
             return _dashboardRepository.GetRecentAlerts(count);
         }
 
+        /// <summary>从sys_config读取heartbeat_interval，计算心跳超时阈值（间隔×3）</summary>
+        private int GetHeartbeatTimeout()
+        {
+            var cfg = _sysConfigRepository.GetByKey("heartbeat_interval");
+            if (cfg != null && int.TryParse(cfg.ConfigValue, out var val) && val > 0)
+                return val * 3;
+            return 30; // 默认10秒间隔 × 3 = 30秒
+        }
+
         /// <inheritdoc/>
         public object GetCollectorStatus()
         {
-            var latest = _collectorHeartbeatRepository.GetLatest("collector-service");
-            // 心跳超时阈值：90秒（3个心跳间隔，采集服务默认每30秒上报一次）
-            const int heartbeatTimeoutSeconds = 90;
+            var latest = _collectorHeartbeatRepository.GetLatest("CncCollector");
+            int heartbeatTimeoutSeconds = GetHeartbeatTimeout();
 
             bool heartbeatRunning = false;
             long heartbeatUptime = 0;
@@ -111,8 +111,30 @@ namespace CncService.Impl
                 serviceStatusText = svc.ToString();
             }
 
-            // 组合状态：NotInstalled -> 停止，其他根据心跳决定
-            string status = (serviceStatusText == "NotInstalled") ? "stopped" : (heartbeatRunning ? "running" : "stopped");
+            // 组合状态：精确区分5种情况
+            string status;
+            if (serviceStatusText == "NotInstalled")
+            {
+                status = "not_installed";
+            }
+            else if (serviceStatusText == "Stopped" || serviceStatusText == "StartFailed")
+            {
+                status = "stopped";
+            }
+            else if (heartbeatRunning)
+            {
+                status = "running";
+            }
+            else if (latest != null && latest.Status == "stopped")
+            {
+                // 引擎主动停止（暂停），心跳status='stopped'
+                status = "paused";
+            }
+            else
+            {
+                // 服务在运行但心跳超时
+                status = "timeout";
+            }
 
             return new {
                 status,

src/CncWebApi/Controllers/DashboardController.cs

@@ -137,15 +137,21 @@ namespace CncWebApi.Controllers
             try
             {
                 dynamic statusObj = _dashboardService.GetCollectorStatus();
+                string status = statusObj?.status as string;
                 string serviceStatus = statusObj?.serviceStatus as string;
                 if (!string.IsNullOrEmpty(serviceStatus) && string.Equals(serviceStatus, "NotInstalled", StringComparison.OrdinalIgnoreCase))
                 {
                     return Ok(ApiResponse<object>.Fail(40001, "采集服务未安装，请先在服务器上运行 install.ps1 安装服务"));
                 }
-                if (!string.IsNullOrEmpty(serviceStatus) && string.Equals(serviceStatus, "Running", StringComparison.OrdinalIgnoreCase))
+                if (status == "running")
                 {
                     return Ok(ApiResponse<object>.Fail(40002, "采集服务已在运行中，无需再次启动"));
                 }
+                if (status == "stopped")
+                {
+                    return Ok(ApiResponse<object>.Fail(40003, "采集服务已停止，请手动启动Windows服务"));
+                }
+                // paused 或 timeout 状态：转发到CncCollector恢复引擎
             }
             catch { /* ignore status fetch errors and fallback to forwarding */ }
 

tests/CncService.Tests/DashboardServiceTests.cs

@@ -12,12 +12,12 @@ namespace CncService.Tests
     // Fake repositories to isolate DashboardService.GetCollectorStatus tests
     public class FakeDashboardRepository : IDashboardRepository
     {
-        public DashboardSummaryResponse GetSummary(int something) => new DashboardSummaryResponse();
+        public DashboardSummaryResponse GetSummary() => new DashboardSummaryResponse();
         public List<WorkshopProductionResponse> GetWorkshopProduction(DateTime startDate, DateTime endDate) => new List<WorkshopProductionResponse>();
-        public List<MachineRankResponse> GetMachineRank(DateTime startDate, DateTime endDate, int top, int something, string sortOrder = "desc") => new List<MachineRankResponse>();
+        public List<MachineRankResponse> GetMachineRank(DateTime startDate, DateTime endDate, int top, string sortOrder = "desc") => new List<MachineRankResponse>();
         public List<WorkerRankResponse> GetWorkerRank(DateTime startDate, DateTime endDate, int top, string sortOrder = "desc") => new List<WorkerRankResponse>();
         public List<dynamic> GetProductionTrend(int days) => new List<dynamic>();
-        public object GetMachineStatusDistribution(int something) => new object();
+        public object GetMachineStatusDistribution() => new object();
         public List<AlertListItem> GetRecentAlerts(int count) => new List<AlertListItem>();
     }