From 7f4dd55c6b0018e134c1825b71f057615df1461a Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Mon, 14 Dec 2020 11:14:44 +0800 Subject: [PATCH] 20201112 --- application/api/controller/Journal.php | 21 ++++++++++++++++++ application/api/controller/Main.php | 27 +++++++++++++++++++++++ application/master/controller/Journal.php | 12 ++++++++-- 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/application/api/controller/Journal.php b/application/api/controller/Journal.php index f86873c..424da49 100644 --- a/application/api/controller/Journal.php +++ b/application/api/controller/Journal.php @@ -20,6 +20,7 @@ class Journal extends Controller { protected $journal_stage_obj = ''; protected $journal_notices_obj = ''; protected $journal_abs_obj = ''; + protected $journal_cfp_obj = ''; protected $article_to_topic_obj = ''; public function __construct(\think\Request $request = null) { @@ -32,6 +33,7 @@ class Journal extends Controller { $this->journal_stage_obj = Db::name('journal_stage'); $this->journal_notices_obj = Db::name('journal_notices'); $this->journal_abs_obj = Db::name('journal_abstracting'); + $this->journal_cfp_obj = Db::name('journal_cfp'); $this->article_to_topic_obj = Db::name('article_to_topic'); } @@ -290,4 +292,23 @@ class Journal extends Controller { return jsonSuccess($re); } + /** + * @title 获取期刊cfp + * @description 获取期刊cfp + * @author wangjinlei + * @url /api/Journal/getJournalCfp + * @method POST + * + * @param name:journal_id type:int require:1 desc:期刊id + * + * @return cfps:期刊cfps# + */ + public function getJournalCfp(){ + $data = $this->request->post(); + $list = $this->journal_cfp_obj->where('journal_id',$data['journal_id'])->where('state',0)->select(); + + $re['cfps'] = $list; + return jsonSuccess($re); + } + } diff --git a/application/api/controller/Main.php b/application/api/controller/Main.php index e1fb22e..51d365e 100644 --- a/application/api/controller/Main.php +++ b/application/api/controller/Main.php @@ -73,4 +73,31 @@ class Main extends Controller{ return jsonSuccess($re); } + /** + * @title 获取首页Highlights + * @description 获取首页Highlights + * @author wangjinlei + * @url /api/Main/getMainhl + * @method POST + * + * @param name:journal_id type:int require:1 desc:期刊id + * + * @return Highlights:array# + */ + public function getMainhl(){ + $data = $this->request->post(); + $topic_info = $this->journal_topic_obj->where('journal_id',$data['journal_id'])->where('position','highlights')->where('state',0)->find(); + if($topic_info){ + $list = $this->article_to_topic_obj->field('j_article.*,j_journal_stage.*') + ->join(array(['j_article','j_article.article_id = j_article_to_topic.article_id','LEFT'],['j_journal_stage','j_journal_stage.journal_stage_id = j_article.journal_stage_id','LEFT'])) + ->where('j_article_to_topic.topic_id',$topic_info['journal_topic_id']) + ->where('j_article_to_topic.state',0) + ->select(); + + return jsonSuccess(['topic_info'=>$topic_info,'articlelist'=>$list]); + }else{ + return jsonError('no highlights'); + } + } + } diff --git a/application/master/controller/Journal.php b/application/master/controller/Journal.php index 15ff41f..fb96c79 100644 --- a/application/master/controller/Journal.php +++ b/application/master/controller/Journal.php @@ -96,6 +96,7 @@ class Journal extends Controller { $insert_data['acceptance'] = $data['acceptance']; $insert_data['finaldecision'] = $data['finaldecision']; $insert_data['sort'] = $data['sort']; + $insert_data['abstract'] = $data['abstract']; $insert_data['jabbr'] = $data['jabbr']; $insert_data['apc'] = $data['apc']; $insert_data['icon'] = $data['icon']; @@ -160,6 +161,7 @@ class Journal extends Controller { $insert_data['acceptance'] = $data['acceptance']; $insert_data['finaldecision'] = $data['finaldecision']; $insert_data['sort'] = $data['sort']; + $insert_data['abstract'] = $data['abstract']; $insert_data['jabbr'] = $data['jabbr']; $insert_data['publish_stage_id'] = $data['publish_stage_id']; $insert_data['apc'] = $data['apc']; @@ -821,7 +823,7 @@ class Journal extends Controller { * @title 编辑期刊收刊信息 * @description 删除期刊收刊文章 * @author wangjinlei - * @url /master/Journal/delJournalCfp + * @url /master/Journal/editJournalCfp * @method POST * * @param name:journal_cfp_id type:int require:1 desc:期刊收刊id @@ -847,13 +849,16 @@ class Journal extends Controller { * * @param name:journal_id type:int require:1 desc:期刊id * + * @return journal:期刊信息# * @return cfps:收刊列表# */ public function getJournalCfps(){ $data = $this->request->post(); + $journal_info = $this->journal_obj->where('journal_id',$data['journal_id'])->find(); $list = $this->journal_cfp_obj->where('journal_id',$data['journal_id'])->where('state',0)->select(); $re['cfps'] = $list; + $re['journal'] = $journal_info; return jsonSuccess($re); } @@ -864,7 +869,7 @@ class Journal extends Controller { * @url /master/Journal/up_cfp_file * @method POST * - * @param name:name type:string require:1 default:journaltopic desc:文件域名称 + * @param name:name type:string require:1 default:journalCfp desc:文件域名称 * * @return upurl:图片地址 */ @@ -1023,13 +1028,16 @@ class Journal extends Controller { * * @param name:journal_paper_id type:int require:1 desc:期刊paperid * + * @return paperinfo:array# * @return articleLists:paperlist# * */ public function getJournalPaperArt(){ $data = $this->request->post(); + $paper_info = $this->journal_paper_obj->where('journal_paper_id',$data['journal_paper_id'])->find(); $list = $this->journal_paper_art_obj->where('journal_paper_id',$data['journal_paper_id'])->where('state',0)->select(); + $re['paperinfo'] = $paper_info; $re['articleLists'] = $list; return jsonSuccess($re); }