队列调整

2025-07-07 17:54:17 +08:00
parent 34cb5037e1
commit 9d8e244ea9
12 changed files with 31 additions and 26 deletions
--- a/application/api/job/ArticleAiCreateContent.php
+++ b/application/api/job/ArticleAiCreateContent.php
@@ -45,9 +45,9 @@ class ArticleAiCreateContent
        //判断Redis是否存在
        $oQueueJob = new QueueJob;
        $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]);
-        if(empty($result)){
+        if($result != 1){
            $job->delete();
-            file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------');
+            file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------');
            return;
        }

--- a/application/api/job/RecommendReviewer.php
+++ b/application/api/job/RecommendReviewer.php
@@ -44,9 +44,9 @@ class RecommendReviewer
        //判断Redis是否存在
        $oQueueJob = new QueueJob;
        $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]);
-        if(empty($result)){
+        if($result != 1){
            $job->delete();
-            file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------');
+            file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------');
            return;
        }

--- a/application/api/job/RelatedArticle.php
+++ b/application/api/job/RelatedArticle.php
@@ -46,9 +46,9 @@ class RelatedArticle
        //判断Redis是否存在
        $oQueueJob = new QueueJob;
        $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]);
-        if(empty($result)){
+        if($result != 1){
            $job->delete();
-            file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------');
+            file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------');
            return;
        }

--- a/application/api/job/ReviewerScore.php
+++ b/application/api/job/ReviewerScore.php
@@ -45,9 +45,9 @@ class ReviewerScore
        //判断Redis是否存在
        $oQueueJob = new QueueJob;
        $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]);
-        if(empty($result)){
+        if($result != 1){
            $job->delete();
-            file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------');
+            file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------');
            return;
        }

--- a/application/api/job/RevisionReviewer.php
+++ b/application/api/job/RevisionReviewer.php
@@ -43,9 +43,9 @@ class RevisionReviewer
        //判断Redis是否存在
        $oQueueJob = new QueueJob;
        $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]);
-        if(empty($result)){
+        if($result != 1){
            $job->delete();
-            file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------');
+            file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------');
            return;
        }

--- a/application/api/job/SendRelatedArticleEmail.php
+++ b/application/api/job/SendRelatedArticleEmail.php
@@ -66,9 +66,9 @@ class SendRelatedArticleEmail
        //判断Redis是否存在
        $oQueueJob = new QueueJob;
        $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]);
-        if(empty($result)){
+        if($result != 1){
            $job->delete();
-            file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------');
+            file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------');
            return;
        }

--- a/application/api/job/SendReviewEmail.php
+++ b/application/api/job/SendReviewEmail.php
@@ -63,9 +63,9 @@ class SendReviewEmail
        //判断Redis是否存在
        $oQueueJob = new QueueJob;
        $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]);
-        if(empty($result)){
+        if($result != 1){
            $job->delete();
-            file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------');
+            file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------');
            return;
        }

--- a/application/api/job/WechatDraft.php
+++ b/application/api/job/WechatDraft.php
@@ -44,9 +44,9 @@ class WechatDraft
        //判断Redis是否存在
        $oQueueJob = new QueueJob;
        $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]);
-        if(empty($result)){
+        if($result != 1){
            $job->delete();
-            file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------');
+            file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------');
            return;
        }

--- a/application/api/job/WechatDraftPublish.php
+++ b/application/api/job/WechatDraftPublish.php
@@ -45,9 +45,9 @@ class WechatDraftPublish
        //判断Redis是否存在
        $oQueueJob = new QueueJob;
        $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]);
-        if(empty($result)){
+        if($result != 1){
            $job->delete();
-            file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------');
+            file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------');
            return;
        }

--- a/application/api/job/WechatMaterial.php
+++ b/application/api/job/WechatMaterial.php
@@ -45,9 +45,9 @@ class WechatMaterial
        //判断Redis是否存在
        $oQueueJob = new QueueJob;
        $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]);
-        if(empty($result)){
+        if($result != 1){
            $job->delete();
-            file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------');
+            file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------');
            return;
        }

--- a/application/api/job/WechatQueryStatus.php
+++ b/application/api/job/WechatQueryStatus.php
@@ -45,9 +45,9 @@ class WechatQueryStatus
        //判断Redis是否存在
        $oQueueJob = new QueueJob;
        $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]);
-        if(empty($result)){
+        if($result != 1){
            $job->delete();
-            file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------');
+            file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------');
            return;
        }

--- a/application/common/QueueJob.php
+++ b/application/common/QueueJob.php
@@ -51,17 +51,22 @@ class QueueJob
     */

    public function setRedisLabel($aParam = []){
+
        //判断数据是否为空
        if(empty($aParam['redis_key'])){
-            return false;
+            return 3;
        }
        //获取值
        $sValue = $this->getRedisLabel($aParam['redis_key']);
-        if(!empty($sValue)){
-            return false;
+        if($sValue == $aParam['redis_key']){
+            return 4;
+        }
+        $result = Cache::set($aParam['redis_key'], $aParam['redis_key'], 3600);
+        if($result == true){
+            return 1;
        }
        //写入
-        return Cache::set($aParam['redis_key'], $aParam['redis_key'], 3600);
+        return 2;
    }

    /**