作者堆叠 专刊

application/common/mq/ReferenceCheckArticleWorker.php

@@ -65,6 +65,8 @@ class ReferenceCheckArticleWorker
     }
     $this->svc->log('ReferenceCheckArticleWorker start p_article_id=' . $pArticleId . ' batch_id=' . $batchId);
 
+    // 快照本批待处理 id：联合引用组长一次会整组落库，循环计数会小于 total_count，收尾按快照回填
+    $trackedIds = $this->listPendingCheckIds($pArticleId);
     $done = 0;
     $failed = 0;
     while (true) {
@@ -84,12 +86,58 @@ class ReferenceCheckArticleWorker
       }
     }
 
+    if (!empty($trackedIds)) {
+      $stats = $this->summarizeTrackedCheckIds($trackedIds);
+      $done = intval($stats['done']);
+      $failed = intval($stats['failed']);
+    }
     $this->finalizeBatch($batchId, $done, $failed);
     $this->svc->log('ReferenceCheckArticleWorker done p_article_id=' . $pArticleId . ' batch_id=' . $batchId . ' done=' . $done . ' failed=' . $failed);
 
     $this->publishNextWaitingBatch();
   }
 
+  private function listPendingCheckIds($pArticleId)
+  {
+    $rows = Db::name('article_reference_relevance_check_result')
+      ->where('p_article_id', intval($pArticleId))
+      ->where('queue_status', ReferenceRelevanceCheckService::QUEUE_PENDING)
+      ->where('status', ReferenceRelevanceCheckService::RECORD_PENDING)
+      ->field('id')
+      ->select();
+    $ids = [];
+    foreach ($rows as $row) {
+      $id = intval(isset($row['id']) ? $row['id'] : 0);
+      if ($id > 0) {
+        $ids[] = $id;
+      }
+    }
+    return $ids;
+  }
+
+  private function summarizeTrackedCheckIds(array $checkIds)
+  {
+    $checkIds = array_values(array_filter(array_map('intval', $checkIds)));
+    if (empty($checkIds)) {
+      return ['done' => 0, 'failed' => 0];
+    }
+    $rows = Db::name('article_reference_relevance_check_result')
+      ->whereIn('id', $checkIds)
+      ->field('id,status')
+      ->select();
+    $done = 0;
+    $failed = 0;
+    foreach ($rows as $row) {
+      $st = intval(isset($row['status']) ? $row['status'] : -1);
+      if ($st === ReferenceRelevanceCheckService::RECORD_COMPLETED) {
+        $done++;
+      } elseif ($st === ReferenceRelevanceCheckService::RECORD_FAILED) {
+        $failed++;
+      }
+    }
+    return ['done' => $done, 'failed' => $failed];
+  }
+
   private function canStartArticleWork($batchId)
   {
     $running = Db::name('article_reference_relevance_check_batch')
@@ -182,18 +230,25 @@ class ReferenceCheckArticleWorker
       return;
     }
     $total = intval($batch['total_count']);
+    $done = intval($done);
+    $failed = intval($failed);
+    // 快照回填后若实际终态条数多于入队 total，抬升 total 保持一致
+    if (($done + $failed) > $total) {
+      $total = $done + $failed;
+    }
     $status = self::BATCH_DONE;
     if ($failed > 0) {
       $status = self::BATCH_PARTIAL_FAILED;
     }
     Db::name('article_reference_relevance_check_batch')->where('id', intval($batchId))->update([
       'batch_status' => $status,
-      'done_count'   => intval($done),
-      'failed_count' => intval($failed),
+      'total_count'  => $total,
+      'done_count'   => $done,
+      'failed_count' => $failed,
       'updated_at'   => date('Y-m-d H:i:s'),
     ]);
     if ($total > 0 && ($done + $failed) < $total) {
-      $this->svc->log('ReferenceCheckArticleWorker batch_id=' . $batchId . ' incomplete total=' . $total);
+      $this->svc->log('ReferenceCheckArticleWorker batch_id=' . $batchId . ' incomplete total=' . $total . ' done=' . $done . ' failed=' . $failed);
     }
   }