diff --git a/application/api/controller/Article.php b/application/api/controller/Article.php index c62420b..b1f7327 100644 --- a/application/api/controller/Article.php +++ b/application/api/controller/Article.php @@ -133,6 +133,15 @@ class Article extends Base return jsonSuccess($re); } + + public function myttt(){ + $res = $this->addProductionEx("3689"); + echo "
";
+        var_dump($res);
+        echo "
"; + die; + } + /**获取预接收内容状态 * @return void */ diff --git a/application/api/controller/Monitor.php b/application/api/controller/Monitor.php index 77d7373..3f2c81e 100644 --- a/application/api/controller/Monitor.php +++ b/application/api/controller/Monitor.php @@ -20,9 +20,19 @@ class Monitor extends Base public function getJournalBoards(){ $journals = $this->journal_obj->where('state',0)->select(); foreach ($journals as $k => $v){ + $boards = $this->board_to_journal_obj->field("t_board_to_journal.*,t_user.google_index,t_user.google_time")->join("t_user","t_user.user_id = t_board_to_journal.user_id","left")->where("t_board_to_journal.journal_id",$v['journal_id'])->where('t_board_to_journal.state',0)->select(); $ca_board = $this->getBoardsForJournal($v['journal_id']); $journals[$k]["boards"] = $ca_board; - $journals[$k]['boards_count'] = $this->board_to_journal_obj->where("journal_id",$v['journal_id'])->where('state',0)->count(); + $journals[$k]['boards_count'] = count($boards); + $board_index = []; + foreach ($boards as $key => $val){ + if($val['google_index']>0){ + $board_index[] = $val['google_index']; + } + } + $journals[$k]['index_num'] = count($board_index); + $journals[$k]['median'] = count($board_index)==0?0:zw_array($board_index); + $journals[$k]['avg'] = count($board_index)==0?0:array_sum($board_index)/count($board_index); } $re['journals'] = $journals; diff --git a/application/api/controller/User.php b/application/api/controller/User.php index e034c9f..5816f27 100644 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -1596,6 +1596,9 @@ class User extends Base $user_info = $this->user_obj->where('account', $account)->find(); if ($user_info['type'] == 2) { $ros[] = 'editor'; + if($account=="liuna"){ + $ros[] = "superadmin"; + } return $ros; } $roles[] = 'author'; @@ -1623,6 +1626,9 @@ class User extends Base if ($special_res != null) { $roles[] = 'special'; } + if($account == "liuna"){ + $roles[] = "superadmin"; + } return $roles; } diff --git a/application/common.php b/application/common.php index 367b2a2..687109f 100644 --- a/application/common.php +++ b/application/common.php @@ -332,6 +332,21 @@ function freshContent($production_obj){ } +function zw_array(array $arr){ + sort($arr); + $count = count($arr); + $middle = floor(($count-1)/2); + + if($count % 2==0){ + $median = ($arr[$middle]+$arr[$middle+1]) / 2; + }else{ + $median = $arr[$middle]; + } + + return $median; +} + + function pushGpt($content){ // die; $url = 'https://api.openai.com/v1/chat/completions';