diff --git a/application/api/controller/Journal.php b/application/api/controller/Journal.php index 71db909..998d482 100644 --- a/application/api/controller/Journal.php +++ b/application/api/controller/Journal.php @@ -742,6 +742,7 @@ class Journal extends Controller { ->join('j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT') ->where('j_article.journal_stage_id', 'in', $stages) ->where('j_article.state', 0) + ->where('j_article.is_public',1) ->order('j_journal_stage.stage_year desc,j_article.sort desc') ->limit($limit_start, $data['pageSize']) ->select(); diff --git a/application/api/controller/Main.php b/application/api/controller/Main.php index 7cb134e..b28445d 100644 --- a/application/api/controller/Main.php +++ b/application/api/controller/Main.php @@ -233,6 +233,7 @@ class Main extends Controller { ->where('j_article.state',0) ->where('j_journal_stage.is_publish',0) ->where('j_article.journal_id','in','1,4,7,8,10,6,14,11,15,17,20,21,22') + ->where('j_article.is_public',1) ->order('j_article.article_id desc') ->limit($limit_start,$data['pageSize']) ->select(); diff --git a/application/master/controller/Article.php b/application/master/controller/Article.php index d4ace9d..498fe3f 100644 --- a/application/master/controller/Article.php +++ b/application/master/controller/Article.php @@ -390,7 +390,7 @@ class Article extends Controller { mkdir(ROOT_PATH.'public'.DS.'articlePDF'.DS.date('Ymd')); } $file_name = substr($data['file_pdf'],strripos($data['file_pdf'],'/')+1); - $co = copy("http://api.tmrjournals.com/public/".$data['file_pdf'],ROOT_PATH.'public'.DS.'articlePDF'.DS.date('Ymd').DS.$file_name); + $co = @copy("http://api.tmrjournals.com/public/".$data['file_pdf'],ROOT_PATH.'public'.DS.'articlePDF'.DS.date('Ymd').DS.$file_name); if($co!=1){ return jsonError('copy error!'); } @@ -398,57 +398,54 @@ class Article extends Controller { $insert['title'] = trim($data['title']); $insert['journal_id'] = $journal_info['journal_id']; $insert['journal_stage_id'] = $data['journal_stage_id']; - $insert['type'] = $data['type']; - if(isset($data['icon'])&&$data['icon']!=''){ - $insert['icon'] = $data['icon']; - } - $insert['doi'] = $data['doi']; - $insert['abstract'] = $data['abstract']; - $insert['pub_date'] = $data['pub_date']; - $insert['keywords'] = $data['keywords']; + // $insert['type'] = $data['type']; + // if(isset($data['icon'])&&$data['icon']!=''){ + // $insert['icon'] = $data['icon']; + // } + // $insert['doi'] = $data['doi']; + // $insert['abstract'] = $data['abstract']; + // $insert['pub_date'] = $data['pub_date']; + // $insert['keywords'] = $data['keywords']; $insert['npp'] = $data['npp']; $insert['file_pdf'] = date('Ymd').DS.$file_name; + $insert['is_public'] = 0; $insert['ctime'] = time(); $aid = $this->article_obj->insertGetId($insert); //处理作者 + // $authors = object_to_array(json_decode($data['authors'])); - $data['authors'] = "[{\"art_aut_id\":6474,\"article_id\":2065,\"firstname\":\"Tadele\",\"lastname\":\"Yadesa\",\"orcid\":\"https:\\/\\/orcid.org\\/ 0000-0001-5151-2610\",\"company\":\"Mbarara University of Science and Technology\",\"department\":\"Pharmacy\",\"email\":\"maatiikoo4@gmail.com\",\"author_title\":\"Ph.D.\",\"country\":\"Uganda\",\"address\":\"Mbarara University of Science and Technology P.O.BOX 1410\",\"is_super\":1,\"is_report\":1,\"state\":0},{\"art_aut_id\":6475,\"article_id\":2065,\"firstname\":\"Oliver\",\"lastname\":\"Kushemererwa\",\"orcid\":\"\",\"company\":\"Mbarara University of Science and Technology\",\"department\":\"Pharmacy\",\"email\":\"Kusholiver@gmail.com\",\"author_title\":\"Others\",\"country\":\"Uganda\",\"address\":\"\",\"is_super\":0,\"is_report\":0,\"state\":0},{\"art_aut_id\":6476,\"article_id\":2065,\"firstname\":\"Joshua\",\"lastname\":\"Kiptoo\",\"orcid\":\"\",\"company\":\"Mbarara University of Science and Technology\",\"department\":\"Pharmacy\",\"email\":\"KIPTOOKWALIA@gmail.com\",\"author_title\":\"Others\",\"country\":\"Uganda\",\"address\":\"\",\"is_super\":0,\"is_report\":0,\"state\":0},{\"art_aut_id\":6477,\"article_id\":2065,\"firstname\":\"John\",\"lastname\":\"Isiiko\",\"orcid\":\"\",\"company\":\"Mbarara University of Science and Technology\",\"department\":\"Pharmacy\",\"email\":\"isiikojohn@gmail.com\",\"author_title\":\"Others\",\"country\":\"Uganda\",\"address\":\"\",\"is_super\":0,\"is_report\":0,\"state\":0},{\"art_aut_id\":6478,\"article_id\":2065,\"firstname\":\"Bonny\",\"lastname\":\"Luzze\",\"orcid\":\"\",\"company\":\"Mbarara University of Science and Technology\",\"department\":\"Pharmacy\",\"email\":\"tottojrlz@gmail.com\",\"author_title\":\"Others\",\"country\":\"Uganda\",\"address\":\"\",\"is_super\":0,\"is_report\":0,\"state\":0},{\"art_aut_id\":6479,\"article_id\":2065,\"firstname\":\"Jacinta\",\"lastname\":\"Ojia\",\"orcid\":\"\",\"company\":\"Mbarara University of Science and Technology\",\"department\":\"Internal medicine\",\"email\":\"ambark21@yahoo.com\",\"author_title\":\"Others\",\"country\":\"Uganda\",\"address\":\"\",\"is_super\":0,\"is_report\":0,\"state\":0},{\"art_aut_id\":6480,\"article_id\":2065,\"firstname\":\"Mohamed\",\"lastname\":\"Abdirahman\",\"orcid\":\"\",\"company\":\"Mbarara University of Science and Technology\",\"department\":\"Internal medicine\",\"email\":\"dr.mma001838@gmail.com\",\"author_title\":\"Others\",\"country\":\"Uganda\",\"address\":\"\",\"is_super\":1,\"is_report\":0,\"state\":0}]"; - - $authors = object_to_array(json_decode($data['authors'])); - - - $o = []; - $orgs = []; - foreach($authors as $k => $v){ - if(in_array($v['company'],$orgs)){ - continue; - } - $orgs[] = $v['company']; - } - foreach($orgs as $v){ - $insert_oo['article_id'] = $aid; - $insert_oo['organ_name'] = $v; - $ca_id = $this->article_organ_obj->insertGetId($insert_oo); - $o[$v] = $ca_id; - } - foreach($authors as $v){ - $insert_author['article_id'] = $aid; - $insert_author['author_name'] = $v['firstname'].' '.$v['lastname']; - $insert_author['first_name'] = $v['firstname']; - $insert_author['last_name'] = $v['lastname']; - $insert_author['author_country'] = $v['country']; - $insert_author['is_first'] = $v['is_super']; - $insert_author['is_report'] = $v['is_report']; - $insert_author['email'] = $v['email']; - $ca_au_id = $this->article_author_obj->insertGetId($insert_author); - $insert_orm['article_id'] = $aid; - $insert_orm['article_author_id'] = $ca_au_id; - $insert_orm['article_organ_id'] = $o[$v['company']]; - $this->author_to_organ_obj->insert($insert_orm); - } + // $o = []; + // $orgs = []; + // foreach($authors as $k => $v){ + // if(in_array($v['company'],$orgs)){ + // continue; + // } + // $orgs[] = $v['company']; + // } + // foreach($orgs as $v){ + // $insert_oo['article_id'] = $aid; + // $insert_oo['organ_name'] = $v; + // $ca_id = $this->article_organ_obj->insertGetId($insert_oo); + // $o[$v] = $ca_id; + // } + // foreach($authors as $v){ + // $insert_author['article_id'] = $aid; + // $insert_author['author_name'] = $v['firstname'].' '.$v['lastname']; + // $insert_author['first_name'] = $v['firstname']; + // $insert_author['last_name'] = $v['lastname']; + // $insert_author['author_country'] = $v['country']; + // $insert_author['is_first'] = $v['is_super']; + // $insert_author['is_report'] = $v['is_report']; + // $insert_author['email'] = $v['email']; + // $ca_au_id = $this->article_author_obj->insertGetId($insert_author); + // $insert_orm['article_id'] = $aid; + // $insert_orm['article_author_id'] = $ca_au_id; + // $insert_orm['article_organ_id'] = $o[$v['company']]; + // $this->author_to_organ_obj->insert($insert_orm); + // } return jsonSuccess([]); } @@ -579,6 +576,7 @@ class Article extends Controller { * @param name:keywords type:string require:1 desc:关键字 * @param name:ltai type:string require:0 desc:标题斜体(demo1,demo2) * @param name:npp type:strng require:1 desc:文章页码 + * @param name:is_public type:int require:1 desc:0不显示1显示 * @param name:type type:string require:1 desc:类型 * @param name:cited type:int require:1 desc:引用数 * @param name:abbr type:string require:0 desc:作者简称 @@ -610,6 +608,7 @@ class Article extends Controller { // $updata['pdf_num'] = $data['pdf_num']; // $updata['html_num'] = $data['html_num']; $updata['npp'] = $data['npp']; + $updata['is_public'] = $data['is_public']; $updata['type'] = $data['type']; $updata['cited'] = $data['cited']; $updata['abbr'] = $data['abbr'];