Merge origin/master

application/api/controller/Article.php

@@ -95,6 +95,24 @@ class Article extends Controller {
             $article_info['last_page'] = $cc[1];
         }
         
+        //添加orDoi
+        if($article_info['journal_id']==1&&$article_info['article_id']<1540){
+            $article_info['ordoi'] = str_replace("10.53388", "10.12032", $article_info['doi']);
+        }elseif($article_info['journal_id']==14&&$article_info['article_id']<1540){
+            $article_info['ordoi'] = str_replace("10.53388", "10.12032", $article_info['doi']);
+        }elseif($article_info['journal_id']==17&&$article_info['article_id']>=735&&$article_info['article_id']<=1534){
+            $article_info['ordoi'] = str_replace("10.53388", "10.12032", $article_info['doi']);
+        }elseif($article_info['journal_id']==8&&$article_info['article_id']>=591&&$article_info['article_id']<=1535){
+            $article_info['ordoi'] = str_replace("10.53388", "10.12032", $article_info['doi']);
+        }elseif($article_info['journal_id']==13&&$article_info['article_id']>=256&&$article_info['article_id']<=1486){
+            $article_info['ordoi'] = str_replace("10.53388", "10.12032", $article_info['doi']);
+        }elseif($article_info['journal_id']==4&&$article_info['article_id']>=872&&$article_info['article_id']<=1508){
+            $article_info['ordoi'] = str_replace("10.53388", "10.12032", $article_info['doi']);
+        }else{
+            $article_info['ordoi'] = '';
+        }
+        
+
         $article_info['publication'] = date('Y/m/d', strtotime($article_info['pub_date']));
 
         //修改keywords
@@ -277,6 +295,15 @@ class Article extends Controller {
             }
             $list[$k]['title'] = $cache_title;
         }
+        //连续出版判断，决定是否显示出版时间 
+        foreach ($list as $k => $v){
+            $ca_stage = $this->journal_stage_obj->where('journal_stage_id',$v['journal_stage_id'])->find();
+            if(($v['journal_id']==2&&$ca_stage['stage_year']>=2022)||($v['journal_id']==18&&$ca_stage['stage_year']>=2022)||($v['journal_id']==17&&$ca_stage['stage_year']>=2019)){
+                $list[$k]['isShowOtime'] = 1;
+            }else{
+                $list[$k]['isShowOtime'] = 0;
+            }
+        }
         $re['topicInfo'] = $topic_info;
         $re['articleList'] = $list;
         $re['count'] = $count;
@@ -342,6 +369,15 @@ class Article extends Controller {
             }
             $list[$k]['title'] = $cache_title;
         }
+        //连续出版判断，决定是否显示出版时间 
+        foreach ($list as $k => $v){
+            $ca_stage = $this->journal_stage_obj->where('journal_stage_id',$v['journal_stage_id'])->find();
+            if(($v['journal_id']==2&&$ca_stage['stage_year']>=2022)||($v['journal_id']==18&&$ca_stage['stage_year']>=2022)||($v['journal_id']==17&&$ca_stage['stage_year']>=2019)){
+                $list[$k]['isShowOtime'] = 1;
+            }else{
+                $list[$k]['isShowOtime'] = 0;
+            }
+        }
         $l = choiseJtitle($list);
         $re['stageInfo'] = $stage_info;
         $re['articleList'] = $l;
@@ -451,6 +487,15 @@ class Article extends Controller {
             }
             $list[$k]['title'] = $cache_title;
         }
+        //连续出版判断，决定是否显示出版时间 
+        foreach ($list as $k => $v){
+            $ca_stage = $this->journal_stage_obj->where('journal_stage_id',$v['journal_stage_id'])->find();
+            if(($v['journal_id']==2&&$ca_stage['stage_year']>=2022)||($v['journal_id']==18&&$ca_stage['stage_year']>=2022)||($v['journal_id']==17&&$ca_stage['stage_year']>=2019)){
+                $list[$k]['isShowOtime'] = 1;
+            }else{
+                $list[$k]['isShowOtime'] = 0;
+            }
+        }
 
         $re['articleList'] = $list;
         $re['count'] = $count;

application/api/controller/Journal.php

@@ -36,8 +36,6 @@ class Journal extends Controller {
     protected $base_topic_obj = '';
     protected $subscribe_base_topic_obj = '';
 
-
-
     public function __construct(\think\Request $request = null) {
         parent::__construct($request);
         $this->admin_obj = Db::name('admin');
@@ -260,6 +258,16 @@ class Journal extends Controller {
             $list[$k]['authortitle'] = $this->getAuthor($v);
         }
 
+        //连续出版判断，决定是否显示出版时间 
+        foreach ($list as $k => $v) {
+            $ca_stage = $this->journal_stage_obj->where('journal_stage_id', $v['journal_stage_id'])->find();
+            if (($v['journal_id'] == 2 && $ca_stage['stage_year'] >= 2022) || ($v['journal_id'] == 18 && $ca_stage['stage_year'] >= 2022) || ($v['journal_id'] == 17 && $ca_stage['stage_year'] >= 2019)) {
+                $list[$k]['isShowOtime'] = 1;
+            } else {
+                $list[$k]['isShowOtime'] = 0;
+            }
+        }
+
 //        //获取作者
 //        foreach ($list as $k => $v) {
 //            $list[$k]['authortitle'] = $this->getAuthor($v);
@@ -332,7 +340,6 @@ class Journal extends Controller {
         return $frag;
     }
 
-
     private function check_topic($value, $frag) {
         $fra = false;
         foreach ($frag as $k => $v) {
@@ -469,6 +476,16 @@ class Journal extends Controller {
             $list[$k]['cite'] = $cite;
             $list[$k]['authortitle'] = $this->getAuthor($v);
         }
+        //连续出版判断，决定是否显示出版时间 
+        foreach ($list as $k => $v) {
+            $ca_stage = $this->journal_stage_obj->where('journal_stage_id', $v['journal_stage_id'])->find();
+            if (($v['journal_id'] == 2 && $ca_stage['stage_year'] >= 2022) || ($v['journal_id'] == 18 && $ca_stage['stage_year'] >= 2022) || ($v['journal_id'] == 17 && $ca_stage['stage_year'] >= 2019)) {
+                $list[$k]['isShowOtime'] = 1;
+            } else {
+                $list[$k]['isShowOtime'] = 0;
+            }
+        }
+
         //标题斜体
         foreach ($list as $k => $v) {
             $caches = $this->article_ltai_obj->where('article_id', $v['article_id'])->where('state', 0)->column('content');
@@ -530,6 +547,17 @@ class Journal extends Controller {
             $list[$k]['authortitle'] = $this->getAuthor($v);
         }
 
+        //连续出版判断，决定是否显示出版时间 
+        foreach ($list as $k => $v) {
+            $ca_stage = $this->journal_stage_obj->where('journal_stage_id', $v['journal_stage_id'])->find();
+            if (($v['journal_id'] == 2 && $ca_stage['stage_year'] >= 2022) || ($v['journal_id'] == 18 && $ca_stage['stage_year'] >= 2022) || ($v['journal_id'] == 17 && $ca_stage['stage_year'] >= 2019)) {
+                $list[$k]['isShowOtime'] = 1;
+            } else {
+                $list[$k]['isShowOtime'] = 0;
+            }
+        }
+
+
         return json(['code' => 0, 'msg' => 'success', 'data' => ['stage' => $stage_info, 'articleList' => $list]]);
     }
 
@@ -655,6 +683,16 @@ class Journal extends Controller {
             $list[$k]['cite'] = $cite;
             $list[$k]['authortitle'] = $this->getAuthor($v);
         }
+
+        //连续出版判断，决定是否显示出版时间 
+        foreach ($list as $k => $v) {
+            $ca_stage = $this->journal_stage_obj->where('journal_stage_id', $v['journal_stage_id'])->find();
+            if (($v['journal_id'] == 2 && $ca_stage['stage_year'] >= 2022) || ($v['journal_id'] == 18 && $ca_stage['stage_year'] >= 2022) || ($v['journal_id'] == 17 && $ca_stage['stage_year'] >= 2019)) {
+                $list[$k]['isShowOtime'] = 1;
+            } else {
+                $list[$k]['isShowOtime'] = 0;
+            }
+        }
         return json(['code' => 0, 'msg' => 'success', 'data' => ['articlelist' => $list, 'count' => $count]]);
     }
 
@@ -704,6 +742,16 @@ class Journal extends Controller {
             $list[$k]['title'] = $cache_title;
         }
 
+        //连续出版判断，决定是否显示出版时间 
+        foreach ($list as $k => $v) {
+            $ca_stage = $this->journal_stage_obj->where('journal_stage_id', $v['journal_stage_id'])->find();
+            if (($v['journal_id'] == 2 && $ca_stage['stage_year'] >= 2022) || ($v['journal_id'] == 18 && $ca_stage['stage_year'] >= 2022) || ($v['journal_id'] == 17 && $ca_stage['stage_year'] >= 2019)) {
+                $list[$k]['isShowOtime'] = 1;
+            } else {
+                $list[$k]['isShowOtime'] = 0;
+            }
+        }
+
         return json(['code' => 0, 'msg' => 'success', 'data' => ['articlelist' => $list]]);
     }
 
@@ -741,6 +789,10 @@ class Journal extends Controller {
                 ->where('j_journal_stage.is_publish', 1)
                 ->count();
         
+        if($count>50){//只显示前50片
+            $count = 50;
+        }
+
         //获取作者
         foreach ($list as $k => $v) {
             $stage_info = $this->journal_stage_obj->where('journal_stage_id', $v['journal_stage_id'])->find();
@@ -753,6 +805,15 @@ class Journal extends Controller {
             $list[$k]['cite'] = $cite;
             $list[$k]['authortitle'] = $this->getAuthor($v);
         }
+        //连续出版判断，决定是否显示出版时间 
+        foreach ($list as $k => $v){
+            $ca_stage = $this->journal_stage_obj->where('journal_stage_id',$v['journal_stage_id'])->find();
+            if(($v['journal_id']==2&&$ca_stage['stage_year']>=2022)||($v['journal_id']==18&&$ca_stage['stage_year']>=2022)||($v['journal_id']==17&&$ca_stage['stage_year']>=2019)){
+                $list[$k]['isShowOtime'] = 1;
+            }else{
+                $list[$k]['isShowOtime'] = 0;
+            }
+        }
 
         //标题斜体
         foreach ($list as $k => $v) {
@@ -848,6 +909,15 @@ class Journal extends Controller {
                 }
                 $list[$k]['title'] = $cache_title;
             }
+            //连续出版判断，决定是否显示出版时间 
+            foreach ($list as $k => $v) {
+                $ca_stage = $this->journal_stage_obj->where('journal_stage_id', $v['journal_stage_id'])->find();
+                if (($v['journal_id'] == 2 && $ca_stage['stage_year'] >= 2022) || ($v['journal_id'] == 18 && $ca_stage['stage_year'] >= 2022) || ($v['journal_id'] == 17 && $ca_stage['stage_year'] >= 2019)) {
+                    $list[$k]['isShowOtime'] = 1;
+                } else {
+                    $list[$k]['isShowOtime'] = 0;
+                }
+            }
 
             return jsonSuccess(['topic_info' => $topic_info, 'articlelist' => $list]);
         } else {
@@ -1040,8 +1110,6 @@ class Journal extends Controller {
         echo '</pre>';
     }
 
-    
-
     /**
      * @title 添加期刊订阅
      * @description 添加期刊订阅
@@ -1503,7 +1571,6 @@ class Journal extends Controller {
         return jsonSuccess($re);
     }
 
-
     /**
      * @title 查找文章精确查找
      * @description 查找文章精确查找

application/api/controller/Main.php

@@ -55,6 +55,11 @@ class Main extends Controller {
         echo md5("S123456pnx");
     }
     
+    
+    public function mddd(){
+        echo md5("zhu18920435065");
+    }
+
     /**
      * @title 获取scients
      * @description 获取scients
@@ -188,6 +193,17 @@ class Main extends Controller {
             }
             $list[$k]['title'] = $cache_title;
         }
+        
+        //连续出版判断，决定是否显示出版时间 
+        foreach ($list as $k => $v){
+            $ca_stage = $this->journal_stage_obj->where('journal_stage_id',$v['journal_stage_id'])->find();
+            if(($v['journal_id']==2&&$ca_stage['stage_year']>=2022)||($v['journal_id']==18&&$ca_stage['stage_year']>=2022)||($v['journal_id']==17&&$ca_stage['stage_year']>=2019)){
+                $list[$k]['isShowOtime'] = 1;
+            }else{
+                $list[$k]['isShowOtime'] = 0;
+            }
+        }
+        
 //        foreach ($list as $k => $v) {
 //            $list[$k]['authortitle'] = $this->getAuthor($v);
 //        }
@@ -281,6 +297,15 @@ class Main extends Controller {
             }
             $list[$k]['title'] = $cache_title;
         }
+        //连续出版判断，决定是否显示出版时间 
+        foreach ($list as $k => $v){
+            $ca_stage = $this->journal_stage_obj->where('journal_stage_id',$v['journal_stage_id'])->find();
+            if(($v['journal_id']==2&&$ca_stage['stage_year']>=2022)||($v['journal_id']==18&&$ca_stage['stage_year']>=2022)||($v['journal_id']==17&&$ca_stage['stage_year']>=2019)){
+                $list[$k]['isShowOtime'] = 1;
+            }else{
+                $list[$k]['isShowOtime'] = 0;
+            }
+        }
         $re['articles'] = $list;
         return jsonSuccess($re);
     }
@@ -361,7 +386,7 @@ class Main extends Controller {
 //        $push_url = 'http://www.journal.com/api/Main/getImgFile';
         
         //定义需要查询同化的数组
-        $list = ['articleCite','articlePDF','articleicon','articleSUB','articleSUB2','baseTopic','journalCfp','journalfooter','journalicon','journalline','rotation','journaltopic','specialIcon','system','articleCDF'];
+        $list = ['articleCite','articlePDF','articleicon','articleSUB','boardIcon','articleSUB2','baseTopic','journalCfp','journalfooter','journalicon','journalline','rotation','journaltopic','specialIcon','system','articleCDF'];
         
         foreach ($list as  $v){
             $dir = $root_url."public/".$v."/".date('Ymd');

application/master/controller/Journal.php

@@ -148,6 +148,7 @@ class Journal extends Controller  {
         $insert_data['editor_id'] = $data['editor_id'];
         $insert_data['system_color'] = $data['system_color'];
         $insert_data['submission_url'] = $data['submission_url'];
+        $insert_data['board_url'] = $data['board_url'];
         $res = $this->journal_obj->insert($insert_data);
         if($res){
             return json(['code'=>0,'msg'=>'success']);
@@ -225,6 +226,7 @@ class Journal extends Controller  {
         $insert_data['editor_id'] = $data['editor_id'];
         $insert_data['system_color'] = $data['system_color'];
         $insert_data['submission_url'] = $data['submission_url'];
+        $insert_data['board_url'] = $data['board_url'];
         $res = $this->journal_obj->where('journal_id',$data['journal_id'])->update($insert_data);
 //        if($res){
         return json(['code'=>0,'msg'=>'success']);
@@ -378,6 +380,8 @@ class Journal extends Controller  {
      * @param name:website type:string require:1 desc:个人主页地址
      * @param name:dr type:string require:1 desc:学位
      * @param name:title type:string require:1 desc:职称
+     * @param name:field type:string require:1 desc:领域描述
+     * @param name:board_icon type:string require:1 desc:编委头像地址
      * @param name:address type:string require:1 desc:单位
      * @param name:country type:string require:1 desc:国家
      * @param name:board_group_id type:int require:1 desc:编委分组id
@@ -386,12 +390,14 @@ class Journal extends Controller  {
         $data = $this->request->post();
         $insert['journal_id'] = $data['journal_id'];
         $insert['type'] = $data['type'];
-        $insert['name'] = $data['name'];
+        $insert['name'] = trim($data['name']);
-        $insert['website'] = $data['website'];
+        $insert['website'] = trim($data['website']);
         $insert['dr'] = $data['dr'];
+        $insert['field'] = trim($data['field']);
         $insert['title'] = $data['title'];
-        $insert['address'] = $data['address'];
+        $insert['address'] = trim($data['address']);
-        $insert['country'] = $data['country'];
+        $insert['country'] = trim($data['country']);
+        $insert['board_icon'] = trim($data['board_icon']);
         $insert['board_group_id'] = $data['board_group_id'];
         $this->board_obj->insert($insert);
         return jsonSuccess([]);
@@ -425,18 +431,22 @@ class Journal extends Controller  {
      * @param name:website type:string require:1 desc:个人主页地址
      * @param name:dr type:string require:1 desc:学位
      * @param name:title type:string require:1 desc:职称
+     * @param name:field type:string require:1 desc:领域描述
      * @param name:address type:string require:1 desc:单位
+     * @param name:board_icon type:string require:1 desc:编委头像
      * @param name:country type:string require:1 desc:国家
      * @param name:board_group_id type:int require:1 desc:编委分组id
      */
     public function editBoard(){
         $data = $this->request->post();
         $insert['type'] = $data['type'];
-        $insert['name'] = $data['name'];
+        $insert['name'] = trim($data['name']);
-        $insert['website'] = $data['website'];
+        $insert['website'] = trim($data['website']);
         $insert['dr'] = $data['dr'];
-        $insert['title'] = $data['title'];
+        $insert['title'] = trim($data['title']);
-        $insert['address'] = $data['address'];
+        $insert['field'] = trim($data['field']);
+        $insert['address'] = trim($data['address']);
+        $insert['board_icon'] = trim($data['board_icon']);
         $insert['country'] = $data['country'];
         $insert['board_group_id'] = $data['board_group_id'];
         
@@ -930,6 +940,30 @@ class Journal extends Controller  {
         }
     }
     
+    
+    /**
+     * @title 编委头像上传
+     * @description 编委头像上传
+     * @author wangjinlei
+     * @url /master/Journal/up_board_file
+     * @method POST
+     * 
+     * @param name:name type:string require:1 default:boardIcon desc:文件域名称
+     * 
+     * @return upurl:图片地址
+     */
+    public function up_board_file() {
+        $file = request()->file('boardIcon');
+        if ($file) {
+            $info = $file->move(ROOT_PATH . 'public' . DS . 'boardIcon');
+            if ($info) {
+                return json(['code'=>0 , 'msg'=>'success', 'upurl' => str_replace("\\", "/", $info->getSaveName())]);
+            } else {
+                return json(['code' => 1, 'msg' => $file->getError()]);
+            }
+        }
+    }
+    
     /**
      * @title line图片上传
      * @description line图片上传