From 7cc88ab176153b869b2c45ecc28ea06b2b8faca8 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 27 Nov 2020 09:49:09 +0800 Subject: [PATCH] 20201112 --- application/master/controller/Article.php | 8 ++- application/master/controller/Journal.php | 84 +++++++++++++++++++++++ 2 files changed, 89 insertions(+), 3 deletions(-) diff --git a/application/master/controller/Article.php b/application/master/controller/Article.php index f807443..033e5e4 100644 --- a/application/master/controller/Article.php +++ b/application/master/controller/Article.php @@ -50,13 +50,13 @@ class Article extends Controller { */ public function getJournalAndStage(){ $data = $this->request->post(); - $journal_list = $this->journal_obj->where('editor_id',$data['editor_id'])->select(); + $journal_list = $this->journal_obj->where('editor_id',$data['editor_id'])->where('state',0)->select(); $frag = []; foreach ($journal_list as $v){ $v['journal_stage_id'] = $v['journal_id']; - $cache_list = $this->journal_stage_obj->where('journal_id',$v['journal_id'])->select(); + $cache_list = $this->journal_stage_obj->where('journal_id',$v['journal_id'])->where('state',0)->select(); foreach($cache_list as $k => $vv){ - $cache_list[$k]['title'] = $vv['stage_year'].' Vol.'.$vv['stage_vol'].' No.'.$vv['stage_no'].' pp. '.$vv['stage_page']; + $cache_list[$k]['title'] = $vv['stage_year'].' Vol.'.$vv['stage_vol'].' issue.'.$vv['stage_no'].$vv['stage_pagename'].$vv['stage_page']; } if(count($cache_list)>0){ $v['children'] = $cache_list; @@ -335,6 +335,7 @@ class Article extends Controller { * @param name:icon type:string require:1 desc:图片 * @param name:tradition_tag type:string require:1 desc:封皮标签 * @param name:tradition type:string require:1 desc:封皮简介 + * @param name:journal_stage_id type:int require:1 desc:期刊分期id * @param name:doi type:string require:1 desc:doi * @param name:abstract type:string require:1 desc:简介 * @param name:keywords type:string require:1 desc:关键字 @@ -346,6 +347,7 @@ class Article extends Controller { public function editArticleBase(){ $data = $this->request->post(); $updata['icon'] = $data['icon']; + $updata['journal_stage_id'] = $data['journal_stage_id']; $updata['tradition_tag'] = $data['tradition_tag']; $updata['tradition'] = $data['tradition']; $updata['doi'] = $data['doi']; diff --git a/application/master/controller/Journal.php b/application/master/controller/Journal.php index dd9c799..227c376 100644 --- a/application/master/controller/Journal.php +++ b/application/master/controller/Journal.php @@ -17,6 +17,7 @@ class Journal extends Controller { protected $article_obj = ''; protected $journal_topic_obj = ''; protected $journal_stage_obj = ''; + protected $journal_abs_obj = ''; protected $article_to_topic_obj = ''; public function __construct(\think\Request $request = null) { @@ -26,6 +27,7 @@ class Journal extends Controller { $this->article_obj = Db::name('article'); $this->journal_topic_obj = Db::name('journal_topic'); $this->journal_stage_obj = Db::name('journal_stage'); + $this->journal_abs_obj = Db::name('journal_abstracting'); $this->article_to_topic_obj = Db::name('article_to_topic'); } @@ -487,6 +489,85 @@ class Journal extends Controller { } } + /** + * @title 添加期刊外链 + * @description 添加期刊外链 + * @author wangjinlei + * @url /master/Journal/addJournalAbs + * @method POST + * + * @param name:journal_id type:int require:1 desc:期刊id + * @param name:title type:int require:1 desc:标题 + * @param name:url type:string require:1 desc:地址 + * @param name:sort type:int require:1 default:0 desc:权重 + * @param name:is_show type:int require:1 default:1 desc:是否显示（1yes0no） + */ + public function addJournalAbs(){ + $data = $this->request->post(); + $add_data['journal_id'] = $data['journal_id']; + $add_data['title'] = $data['title']; + $add_data['url'] = $data['url']; + $add_data['sort'] = $data['sort']; + $add_data['is_show'] = $data['is_show']; + $res = $this->journal_abs_obj->insert($add_data); + if($res){ + return json(['code'=>0,'msg'=>'success']); + }else{ + return json(['code'=>1,'msg'=>'system error!']); + } + } + + /** + * @title 删除期刊外链 + * @description 删除期刊外链 + * @author wangjinlei + * @url /master/Journal/delJournalAbs + * @method POST + * + * @param name:journal_abstracting_id type:int require:1 desc:期刊外链id + */ + public function delJournalAbs(){ + $data = $this->request->post(); + $this->journal_abs_obj->where('journal_abstracting_id',$data['journal_abstracting_id'])->update(['state'=>1]); + return json(['code'=>0,'msg'=>'success']); + } + + /** + * @title 编辑期刊外链 + * @description 编辑期刊外链 + * @author wangjinlei + * @url /master/Journal/editJournalAbs + * @method POST + * + * @param name:journal_abstracting_id type:int require:1 desc:期刊外链id + * @param name:journal_id type:int require:1 desc:期刊id + * @param name:title type:int require:1 desc:标题 + * @param name:url type:string require:1 desc:地址 + * @param name:sort type:int require:1 default:0 desc:权重 + * @param name:is_show type:int require:1 default:1 desc:是否显示（1yes0no） + */ + public function editJournalAbs(){ + $data = $this->request->post(); + $this->journal_abs_obj->update($data); + return json(['code'=>0,'msg'=>'success']); + } + + /** + * @title 获取期刊外链 + * @description 获取期刊外链 + * @author wangjinlei + * @url /master/Journal/getJournalAbs + * @method POST + * + * @param name:journal_id type:int require:1 desc:期刊id + */ + public function getJournalAbs(){ + $data = $this->request->post(); + $journal_info = $this->journal_obj->where('journal_id',$data['journal_id'])->find(); + $list = $this->journal_abs_obj->where('journal_id',$data['journal_id'])->where('state',0)->order('sort desc')->select(); + return json(['code'=>0,'msg'=>'success','data'=>['journal'=>$journal_info,'absList'=>$list]]); + } + /** * @title topic图片上传 * @description topic图片上传 @@ -521,6 +602,7 @@ class Journal extends Controller { * @param name:stage_year type:string require:1 desc:分期年份 * @param name:stage_vol type:int require:1 desc:分期卷数 * @param name:stage_no type:int require:1 desc:分期号码 + * @param name:stage_pagename type:string require:1 desc:page名称 * @param name:stage_page type:string require:1 desc:分期页码 * @param name:issue_date type:string require:1 desc:发布时间 */ @@ -530,6 +612,7 @@ class Journal extends Controller { $insert_data['stage_year'] = $data['stage_year']; $insert_data['stage_vol'] = $data['stage_vol']; $insert_data['stage_no'] = $data['stage_no']; + $insert_data['stage_pagename'] = $data['stage_pagename']; $insert_data['stage_page'] = $data['stage_page']; $insert_data['issue_date'] = $data['issue_date']; $res = $this->journal_stage_obj->insert($insert_data); @@ -589,6 +672,7 @@ class Journal extends Controller { * @param name:stage_year type:string require:1 desc:分期年份 * @param name:stage_vol type:int require:1 desc:分期卷数 * @param name:stage_no type:int require:1 desc:分期号码 + * @param name:stage_pagename type:string require:1 desc:分期页码name * @param name:stage_page type:string require:1 desc:分期页码 * @param name:issue_date type:string require:1 desc:发布时间 */