From 02bab8c55952c8dc77d152ada31cf305cd1a44c9 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Tue, 7 Jan 2025 10:07:34 +0800
Subject: [PATCH] 1

---
 application/api/controller/Journal.php     | 63 ++++++++++++++++------
 application/master/controller/Datebase.php |  8 +--
 2 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/application/api/controller/Journal.php b/application/api/controller/Journal.php
index 8178ab8..eaaa718 100644
--- a/application/api/controller/Journal.php
+++ b/application/api/controller/Journal.php
@@ -867,26 +867,55 @@ class Journal extends Controller {
         $data = $this->request->post();
         $journal_info = $this->journal_obj->where('journal_id', $data['journal_id'])->find();
         $limit_start = ($data['pageIndex'] - 1) * $data['pageSize'];
-        $list = $this->article_obj->field('j_article.*,j_journal_stage.*')
-                ->join('j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT')
-                ->where('j_article.journal_id', $data['journal_id'])
-                ->where('j_article.state', 0)
-                ->where('j_journal_stage.is_publish', 1)
-                ->where("j_journal_stage.stage_year",">",intval(date("Y"))-3)
-                ->orderRaw('j_article.cited+j_article.abs_num+j_article.pdf_num desc')
-                ->limit($limit_start, $data['pageSize'])
-                ->select();
+
+
+
+        $list = $this->article_obj
+            ->field("j_article.*,count(j_article_cite.article_id) as cited_num")
+            ->join("j_journal_stage",'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT')
+            ->join("j_article_cite","j_article_cite.article_id = j_article.article_id","left")
+            ->where('j_article.journal_id', $data['journal_id'])
+            ->where('j_article.state', 0)
+            ->where('j_journal_stage.is_publish', 1)
+            ->group("j_article.article_id")
+            ->order("cited_num desc")
+            ->limit($limit_start,$data['pageSize'])
+            ->select();
 
         $count = $this->article_obj
-                ->join('j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT')
-                ->where('j_article.journal_id', $data['journal_id'])
-                ->where('j_article.state', 0)
-                ->where('j_journal_stage.is_publish', 1)
-                ->where("j_journal_stage.stage_year",">",intval(date("Y"))-3)
-                ->count();
+            ->join("j_journal_stage",'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT')
+//            ->join("j_article_cite","j_article_cite.article_id = j_article.article_id","left")
+            ->where('j_article.journal_id', $data['journal_id'])
+            ->where('j_article.state', 0)
+            ->where('j_journal_stage.is_publish', 1)
+            ->group("j_article.article_id")
+            ->count();
+
+
+
+
+
+
+//        $list = $this->article_obj->field('j_article.*,j_journal_stage.*')
+//                ->join('j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT')
+//                ->where('j_article.journal_id', $data['journal_id'])
+//                ->where('j_article.state', 0)
+//                ->where('j_journal_stage.is_publish', 1)
+//                ->where("j_journal_stage.stage_year",">",intval(date("Y"))-3)
+//                ->orderRaw('j_article.cited+j_article.abs_num+j_article.pdf_num desc')
+//                ->limit($limit_start, $data['pageSize'])
+//                ->select();
+//
+//        $count = $this->article_obj
+//                ->join('j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT')
+//                ->where('j_article.journal_id', $data['journal_id'])
+//                ->where('j_article.state', 0)
+//                ->where('j_journal_stage.is_publish', 1)
+//                ->where("j_journal_stage.stage_year",">",intval(date("Y"))-3)
+//                ->count();
         
-        if($count>50){//只显示前50片
-            $count = 50;
+        if($count>100){//只显示前50片
+            $count = 100;
         }
         return jsonSuccess(['articles' => strongArticleList($list), 'count' => $count]);
     }
diff --git a/application/master/controller/Datebase.php b/application/master/controller/Datebase.php
index 3b476d1..d957a2e 100644
--- a/application/master/controller/Datebase.php
+++ b/application/master/controller/Datebase.php
@@ -793,10 +793,10 @@ class Datebase extends Controller
 //        $elist[] = "3601240974@qq.com";
         if ($journal_info["journal_id"] == 1) {
             $elist[] = "958518573@qq.com";
-            $elist[] = "swyy2@wanfangdata.com.cn";
+            $elist[] = "swyy2@wanfangdata.com.cn";//万方数据库
         }
         $elist[] = "3097953993@qq.com";
-        $elist[] = "849192806@qq.com"; //皮皮
+//        $elist[] = "849192806@qq.com"; //皮皮
         $elist[] = "751475802@qq.com"; //我
 //        $elist[] = "ELD@dia.govt.nz";
 
@@ -814,10 +814,10 @@ class Datebase extends Controller
         //发送sftp
         $this->bf_db_push($data["journal_stage_id"]);
         // 发送ftp
-        $this->createFtpFileInfo($data["journal_stage_id"]);
+        $this->createFtpFileInfo($data["journal_stage_id"]);//cnki数据库
 
         if($journal_info['journal_id']==1){
-            $this->scopusPushXML($data["journal_stage_id"]);
+            $this->scopusPushXML($data["journal_stage_id"]);//scopus数据库
         }
         return jsonSuccess([]);
     }