队列相关的调整

application/api/job/WechatMaterial.php

@@ -1,40 +1,63 @@
 <?php
 namespace app\api\job;
-use think\Log;
 use think\queue\Job;
 use app\api\controller\Aiarticle;
+use app\common\QueueJob;
 class WechatMaterial
 {
     // 上传素材任务入口
     public function fire(Job $job, $data)
     {
 
+        //获取任务ID
+        $iLogId = 0;
         try {
-            // 步骤1：上传素材（图片）
-            if (!empty($data['article_id'])) {
-                $oAiarticle = new Aiarticle;
-                // $aResult = json_decode($oAiarticle->uploadMaterial($data),true);
-                $iStatus = empty($aResult['status']) ? 0 : $aResult['status'];
-                $sMsg = empty($aResult['msg']) ? '' : $aResult['msg'];
-                if ($iStatus != 1) {
-                    $iStatus = 2;
-                    $sMsg = empty($sMsg) ? '素材上传失败' : $sMsg;
-                }
-                //插入日志记录
-                $aLogInfo = ['article_id' => $data['article_id'],'type' => 1,'msg' =>$sMsg,'status' => $iStatus,'create_time' => time()];
-                $result = json_decode($oAiarticle->addWechatLog($aLogInfo),true);
-                $iStatus = empty($result['status']) ? 0 : $result['status']; 
-                $sMsg = empty($result['msg']) ? '插入日志记录失败' : $result['msg'];
-                if($iStatus != 1){
-                     Log::error($sMsg."\n".json_encode($aLogInfo) . $e->getMessage());
-                }
-            }
 
+            //实例化
+            $oQueueJob = new QueueJob;
+            $sMsg = '上传素材成功';
+            if(!empty($job->getRawBody())){
+                $aJob = json_decode($job->getRawBody(), true);
+                $aParam = [
+                    'job_id'     => empty($aJob['id']) ? '' : $aJob['id'],
+                    'job_class'  => get_class($this),
+                    'status'     => 0,
+                    'create_time' => time(),
+                    'params'     => json_encode($aJob, JSON_UNESCAPED_UNICODE)
+                ];          
+                $iLogId = $oQueueJob->addLog($aParam);
+                // 步骤1：上传素材（图片）
+                $iArticleId = empty($data['article_id']) ? 0 : $data['article_id'];
+                if (!empty($iArticleId)) {
+                    //上传素材
+                    $oAiarticle = new Aiarticle;
+                    $aResult = json_decode($oAiarticle->uploadMaterial($data),true);
+                    $iStatus = empty($aResult['status']) ? 0 : $aResult['status']; 
+                    $sMsg = empty($aResult['msg']) ? '上传素材失败' : $aResult['msg'];
+                }
+            }
+            $job->delete();
+
+            //更新任务状态
+            $aParam = ['log_id' => $iLogId,'status' => 1,'update_time' => time(),'error' => $sMsg];
+            $oQueueJob->updateLog($aParam);
+
+            // // 记录日志
+            // \think\Log::info("WechatMaterial-延迟任务执行成功: ".json_encode($data));
         } catch (\Exception $e) {
-            Log::error("上传素材任务异常：" . $e->getMessage());
+
+            //实例化
+            $oQueueJob = new QueueJob;
+            //更新任务状态
+            $sMsg = empty($e->getMessage()) ? '任务出错' : $e->getMessage();
+            $aParam = ['log_id' => $iLogId,'status' => 2,'update_time' => time(),'error' => $sMsg];
+            $oQueueJob->updateLog($aParam);
+            $job->delete();
+
+            // // 记录错误日志
+            // \think\Log::error("WechatMaterial-延迟任务失败: ".$e->getMessage());
         }finally {
             gc_collect_cycles(); // 强制垃圾回收
         }
     }
-
 }