Merge remote-tracking branch 'origin/master'

application/api/controller/Articletype.php

@@ -0,0 +1,31 @@
+<?php
+namespace app\api\controller;
+
+use app\api\controller\Base;
+
+/**
+ * @title 文章类型接口
+ * @description 文章接口
+ */
+class Articletype extends Base
+{
+
+	/**
+	 * @title 文章类型接口
+	 * @description 文章接口
+	 */
+
+	public function getArticleType(){
+		return json_encode(['status' => 1,'msg' => 'success','data' => getArticleType()]);	
+	}
+
+	/**
+	 * @title 医学类型接口
+	 * @description 医学类型接口
+	 */
+	
+	public function getMedicalType(){
+		return json_encode(['status' => 1,'msg' => 'success','data' => getMedicalType()]);	
+	}
+}
+?>

application/api/controller/Crontask.php

@@ -371,7 +371,7 @@ class Crontask extends Controller
             'ctime'=>['>',$sDate],
             'state'=>['in',[1,2,3]]
         ];
-        $aReviewer = Db::name('article_reviewer')->field('reviewer_id,count(article_id) as review_num_two_year ')->where($aWhere)->order('reviewer_id asc')->group('reviewer_id')->select();
+        $aReviewer = Db::name('article_reviewer')->field('reviewer_id,count(article_id) as review_num_two_year')->where($aWhere)->order('reviewer_id asc')->group('reviewer_id')->select();
 
         //查询审稿人数量不为0的审稿信息
         $aUserWhere = [

application/api/controller/Queueinfo.php

@@ -0,0 +1,99 @@
+<?php
+namespace app\api\controller;
+use app\api\controller\Base;
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\Config;
+use think\Request;
+
+class Queueinfo extends Base
+{
+
+     public function __construct(\think\Request $request = null) {
+
+        $this->proxy = '';
+
+        parent::__construct($request);
+    }
+    // Redis队列展示
+    public function show() {
+
+        $aParam = $this->request->post();
+        $config = \think\Config::get('queue');
+
+        $config['queue'] = empty($aParam['queue_name']) ? 'ArticleAiCreateContent' : $aParam['queue_name'];
+        $redis = new \Redis();
+        $redis->connect($config['host'], $config['port']);
+        
+        if (!empty($config['password'])) {
+            $redis->auth($config['password']);
+        }
+        
+        $redis->select($config['select']);
+        
+        // 获取不同队列类型的任务数
+        $aQueue = ['ArticleAiCreateContent','WechatMaterial','WechatDraft','WechatQueryStatus'];
+        foreach ($aQueue as $key => $value) {
+            $types[$value] = [
+                'pending'  => 'queues:'.$value,
+                'delayed'  => 'queues:'.$value.':delayed',
+                'failed'   => 'queues:'.$value.':failed',
+                'reserved' => 'queues:'.$value.':reserved',
+            ];
+        }   
+        $counts = [];
+        foreach ($types as $k => $value) {
+            foreach ($value as $type => $key) {
+                if($type == 'pending'){
+                    $counts[$k][$key] = $redis->lrange($key,0,-1);
+                }else{
+                    $counts[$k][$key] = $redis->zRange($key,0,-1);
+                }
+            } 
+        }
+echo '<pre>';var_dump($counts);
+    }
+    // Redis值删除
+    public function remove() {
+
+        $aParam = $this->request->post();
+        $config = \think\Config::get('queue');
+
+        $sQueueName = empty($aParam['queue_name']) ? 'ArticleAiCreateContent' : $aParam['queue_name'];
+        $redis = new \Redis();
+        $redis->connect($config['host'], $config['port']);
+        
+        if (!empty($config['password'])) {
+            $redis->auth($config['password']);
+        }
+        
+        $redis->select($config['select']);
+        
+
+        $sQueueType = empty($aParam['queue_type']) ? '' : $aParam['queue_type'];
+        $iNum =  empty($aParam['queue_num']) ? 0 : $aParam['queue_num'];
+        if(empty($iNum) || empty($sQueueType)){
+            echo '非法操作';
+            exit;
+        }
+        // 获取不同队列类型的任务数
+        $sKey  = 'queues:'.$sQueueName;
+        if(!empty($sQueueType)){
+            $sKey .= ':'.$sQueueType;
+        }
+        $counts = [];
+        if($sQueueType == 'pending'){
+            $sQueueInfo = $redis->LINDEX($sKey,$iNum);
+        }else{
+            $sQueueInfo = $redis->ZRANGE($sKey,0,-1);
+        }
+
+        if(!empty($sQueueInfo)){
+            
+        }
+
+echo '<pre>';var_dump($sQueueInfo,$sKey,$iNum);exit;
+
+    }
+}