zm/journal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20201112

Browse Source
This commit is contained in:
wangjinlei
2020-12-24 15:14:02 +08:00
parent c7ef740a13
commit 096cb1e571
4 changed files with 261 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/master/controller/Article.php
View File

@@ -352,7 +352,7 @@ class Article extends Controller {
$list = scandir(ROOT_PATH.'public/articleHTML/'.$journal_info['sx']);
$frag = [];
foreach ($list as $k => $v){
if($k>2){
if($k>1){
$frag[] = ['val'=>$v];
}
}
@@ -366,13 +366,12 @@ class Article extends Controller {
public function getHtmlFiles(){
$data = $this->request->post();
// $data['article_id'] = 1;
$article_info = $this->article_obj->where('article_id',$data['article_id'])->find();
$journal_info = $this->journal_obj->where('journal_id',$article_info['journal_id'])->find();
$list = scandir(ROOT_PATH.'public/articleHTML/'.$journal_info['sx']);
$frag = [];
foreach ($list as $k => $v){
if($k>2){
if($k>1){
$frag[] = $v;
}
}

181
application/master/controller/Journal.php
View File

@@ -17,9 +17,11 @@ class Journal extends Controller {
protected $article_obj = '';
protected $journal_topic_obj = '';
protected $journal_stage_obj = '';
protected $journal_line_obj = '';
protected $journal_notices_obj = '';
protected $journal_abs_obj = '';
protected $article_to_topic_obj = '';
protected $article_to_line_obj = '';
protected $journal_cfp_obj = '';
protected $journal_paper_obj = '';
protected $journal_paper_art_obj = '';
@@ -31,9 +33,11 @@ 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_line_obj = Db::name('journal_line');
$this->journal_notices_obj = Db::name('journal_notices');
$this->journal_abs_obj = Db::name('journal_abstracting');
$this->article_to_topic_obj = Db::name('article_to_topic');
$this->article_to_line_obj = Db::name('article_to_line');
$this->journal_cfp_obj = Db::name('journal_cfp');
$this->journal_paper_obj = Db::name('journal_paper');
$this->journal_paper_art_obj = Db::name('journal_paper_art');
@@ -1010,6 +1014,183 @@ class Journal extends Controller {
return jsonSuccess([]);
}
/**
* @title 增加期刊line
* @description 增加期刊line
* @author wangjinlei
* @url /master/Journal/addJournalLine
* @method POST
*
* @param name:journal_id type:int require:1 desc:期刊id
* @param name:title type:string require:1 desc:标题
* @param name:time type:string require:1 desc:时间
* @param name:intro type:string require:1 desc:简介
* @param name:dist type:int require:1 desc:距离
*/
public function addJournalLine(){
$data = $this->request->post();
$insert['journal_id'] = $data['journal_id'];
$insert['title'] = $data['title'];
$insert['time'] = $data['time'];
$insert['intro'] = $data['intro'];
$insert['dist'] = $data['dist'];
$this->journal_line_obj->insert($insert);
return jsonSuccess([]);
}
/**
* @title 删除期刊line
* @description 删除期刊line
* @author wangjinlei
* @url /master/Journal/delJournalLine
* @method POST
*
* @param name:journal_line_id type:int require:1 desc:期刊时间轴id
*/
public function delJournalLine(){
$data = $this->request->post();
$this->journal_line_obj->where('journal_line_id',$data['journal_line_id'])->update(['state'=>1]);
return jsonSuccess([]);
}
/**
* @title 编辑期刊line
* @description 编辑期刊line
* @author wangjinlei
* @url /master/Journal/editJournalLine
* @method POST
*
* @param name:journal_line_id type:int require:1 desc:期刊时间轴id
* @param name:title type:string require:1 desc:标题
* @param name:time type:string require:1 desc:时间
* @param name:intro type:string require:1 desc:简介
* @param name:dist type:int require:1 desc:距离
*/
public function editJournalLine(){
$data = $this->request->post();
$update['title'] = $data['title'];
$update['time'] = $data['time'];
$update['intro'] = $data['intro'];
$update['dist'] = $data['dist'];
$this->journal_line_obj->where('journal_line_id',$data['journal_line_id'])->update($update);
return jsonSuccess([]);
}
/**
* @title 获取期刊lines
* @description 获取期刊lines
* @author wangjinlei
* @url /master/Journal/getJournalLines
* @method POST
*
* @param name:journal_id type:int require:1 desc:期刊id
*
* @return journal:期刊信息#
* @return lines:array#
*/
public function getJournalLines(){
$data = $this->request->post();
$journal_info = $this->journal_obj->where('journal_id',$data['journal_id'])->find();
$list = $this->journal_line_obj->where('journal_id',$data['journal_id'])->where('state',0)->order('journal_line_id')->select();
$re['journal'] = $journal_info;
$re['lines'] = $list;
return jsonSuccess($re);
}
/**
* @title 增加期刊line文章
* @description 增加期刊line文章
* @author wangjinlei
* @url /master/Journal/addJournalLineArt
* @method POST
*
* @param name:journal_line_id type:int require:1 desc:期刊id
* @param name:article_id type:int require:1 desc:文章id
*
*/
public function addJournalLineArt(){
$data = $this->request->post();
$insert['journal_line_id'] = $data['journal_line_id'];
$insert['article_id'] = $data['article_id'];
$this->article_to_line_obj->insert($insert);
return jsonSuccess([]);
}
/**
* @title 删除期刊line文章
* @description 删除期刊line文章
* @author wangjinlei
* @url /master/Journal/delJournalLineArt
* @method POST
*
* @param name:article_to_line_id type:int require:1 desc:期刊id
*
*/
public function delJournalLineArt(){
$data = $this->request->post();
$this->article_to_line_obj->where('article_to_line_id',$data['article_to_line_id'])->update(['state'=>1]);
return jsonSuccess([]);
}
/**
* @title 获取期刊line文章
* @description 获取期刊line文章
* @author wangjinlei
* @url /master/Journal/getJournalLineArt
* @method POST
*
* @param name:journal_line_id type:int require:1 desc:期刊lineid
*
* @return journalLine:期刊line#
* @return journal:期刊信息#
* @return articles: 文章列表array#
*
*/
public function getJournalLineArt(){
$data = $this->request->post();
$journal_line_info = $this->journal_line_obj->where('journal_line_id',$data['journal_line_id'])->find();
$journal_info = $this->journal_obj->where('journal_id',$journal_line_info['journal_id'])->find();
$list = $this->article_to_line_obj->field('j_article.*')
->join('j_article','j_article.article_id = j_article_to_line.article_id','LEFT')
->where('j_article_to_line.journal_line_id',$data['journal_line_id'])
->where('j_article_to_line.state',0)
->select();
$re['journalLine'] = $journal_line_info;
$re['journal'] = $journal_info;
$re['articles'] = $list;
return jsonSuccess($re);
}
/**
* @title 获取文章排除line
* @description 获取文章排除line
* @author wangjinlei
* @url /master/Journal/getArticleByLine
* @method POST
*
* @param name:journal_id type:int require:1 desc:期刊id
* @param name:journal_line_id type:int require:1 desc:时间线id
* @param name:pageIndex type:int require:1 desc:当前页码数
* @param name:pageSize type:int require:1 desc:单页数据条数
*
* $return count:总数
* @return dataList:array#
*/
public function getArticleByLine(){
$data = $this->request->post();
//排除line
$ids = $this->article_to_line_obj->where('journal_line_id',$data['journal_line_id'])->where('state',0)->column('article_id');
$limit_start = ($data['pageIndex'] - 1) * $data['pageSize'];
$list = $this->article_obj->where('journal_id',$data['journal_id'])->where('state',0)->where('article_id','not in',$ids)->limit($limit_start,$data['pageSize'])->select();
$count = $this->article_obj->where('journal_id',$data['journal_id'])->where('state',0)->where('article_id','not in',$ids)->count();
$re['count'] = $count;
$re['dataList'] = $list;
return jsonSuccess($re);
}
/**
* @title 获取期刊paper
* @description 获取期刊paper