|
@@ -426,28 +426,32 @@ class CollectorService implements CollectorServiceInterface
|
|
*/
|
|
*/
|
|
public function addArt(array $data): array
|
|
public function addArt(array $data): array
|
|
{
|
|
{
|
|
|
|
+ // var_dump("======@@@====");
|
|
$where = [
|
|
$where = [
|
|
'rule_id' => $data['rule_id'],
|
|
'rule_id' => $data['rule_id'],
|
|
'state' => 0
|
|
'state' => 0
|
|
];
|
|
];
|
|
$arts_id = Article::where($where)->wherenotNull('catid')->orderBy('id')->select('id')->get();
|
|
$arts_id = Article::where($where)->wherenotNull('catid')->orderBy('id')->select('id')->get();
|
|
$arts = Article::where($where)->wherenotNull('catid')->select('title','catid','level','introduce','keyword','author','copyfrom','fromurl','hits','islink','imgurl','admin_user_id','is_original')->orderBy('id')->get()->toArray();
|
|
$arts = Article::where($where)->wherenotNull('catid')->select('title','catid','level','introduce','keyword','author','copyfrom','fromurl','hits','islink','imgurl','admin_user_id','is_original')->orderBy('id')->get()->toArray();
|
|
|
|
+ $arts_data = ArticleData::whereIn('article_id',$arts_id)->select('content')->orderBy('article_id')->get()->toArray();
|
|
|
|
+ // var_dump($article_data);
|
|
|
|
+ $data = [
|
|
|
|
+ 'articles' => $arts,
|
|
|
|
+ 'art_content' => $arts_data
|
|
|
|
+ ];
|
|
Db::beginTransaction();
|
|
Db::beginTransaction();
|
|
try{
|
|
try{
|
|
- $arts_data = ArticleData::whereIn('article_id',$arts_id)->select('content')->orderBy('article_id')->get()->toArray();
|
|
|
|
|
|
+
|
|
$oldart = OldArticle::insert($arts);
|
|
$oldart = OldArticle::insert($arts);
|
|
$oldart_data = OldArticleData::insert($arts_data);
|
|
$oldart_data = OldArticleData::insert($arts_data);
|
|
|
|
+ $upstate_art = Article::where($where)->wherenotNull('catid')->update(['state' => 1]);
|
|
Db::commit();
|
|
Db::commit();
|
|
|
|
+
|
|
} catch(\Throwable $ex){
|
|
} catch(\Throwable $ex){
|
|
Db::rollBack();
|
|
Db::rollBack();
|
|
var_dump($ex->getMessage());
|
|
var_dump($ex->getMessage());
|
|
return Result::error($ex->getMessage(),0);
|
|
return Result::error($ex->getMessage(),0);
|
|
}
|
|
}
|
|
- // var_dump($article_data);
|
|
|
|
- $data = [
|
|
|
|
- 'rep' => $oldart,
|
|
|
|
- 'content' => $oldart_data
|
|
|
|
- ];
|
|
|
|
return Result::success($data);
|
|
return Result::success($data);
|
|
}
|
|
}
|
|
}
|
|
}
|