更新若干代码
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
namespace app\admin\controller;
|
||||
use app\admin\controller\Base;
|
||||
use app\admin\model\Article\Article;
|
||||
use app\admin\model\ArticleCategory;
|
||||
use app\admin\model\Article\ArticleCategory;
|
||||
use think\facade\Db;
|
||||
use think\facade\View;
|
||||
use think\facade\Request;
|
||||
@@ -18,20 +18,18 @@ class Articles extends Base
|
||||
{
|
||||
if (Request::isPost()) {
|
||||
$category = input('post.category');
|
||||
$page = input('post.page', 1);
|
||||
$limit = input('post.limit', 10);
|
||||
$page = intval(input('post.page', 1));
|
||||
$limit = intval(input('post.limit', 10));
|
||||
$title = input('post.title');
|
||||
$author = input('post.author');
|
||||
|
||||
$query = Db::name('article')
|
||||
->where('delete_time', null)
|
||||
$query = Article::where('delete_time', null)
|
||||
->where('status', '<>', 3);
|
||||
|
||||
// 分类筛选
|
||||
if (!empty($category)) {
|
||||
// 先获取分类ID
|
||||
$cateInfo = Db::name('article_category')
|
||||
->where('name', $category)
|
||||
$cateInfo = ArticleCategory::where('name', $category)
|
||||
->where('delete_time', null)
|
||||
->where('status', 1)
|
||||
->find();
|
||||
@@ -60,22 +58,21 @@ class Articles extends Base
|
||||
->select()
|
||||
->each(function ($item) {
|
||||
// 获取分类信息
|
||||
$cateInfo = Db::name('article_category')
|
||||
->where('id', $item['cate'])
|
||||
$cateInfo = ArticleCategory::where('id', $item['cate'])
|
||||
->field('name, image')
|
||||
->find();
|
||||
|
||||
// 设置分类名称
|
||||
$item['cate'] = $cateInfo['name'];
|
||||
$item['cate'] = $cateInfo ? $cateInfo['name'] : '';
|
||||
|
||||
// 如果文章没有图片,使用分类的图片
|
||||
if (empty($item['image']) && !empty($cateInfo['image'])) {
|
||||
if (empty($item['image']) && $cateInfo && !empty($cateInfo['image'])) {
|
||||
$item['image'] = $cateInfo['image'];
|
||||
}
|
||||
|
||||
// 格式化时间
|
||||
$item['create_time'] = date('Y-m-d H:i:s', $item['create_time']);
|
||||
$item['publishdate'] = $item['publishdate'] ? date('Y-m-d H:i:s', $item['publishdate']) : '';
|
||||
$item['create_time'] = is_numeric($item['create_time']) ? date('Y-m-d H:i:s', $item['create_time']) : $item['create_time'];
|
||||
$item['publishdate'] = is_numeric($item['publishdate']) ? date('Y-m-d H:i:s', $item['publishdate']) : '';
|
||||
|
||||
return $item;
|
||||
});
|
||||
@@ -88,8 +85,7 @@ class Articles extends Base
|
||||
]);
|
||||
} else {
|
||||
// 获取所有分类并构建父子结构
|
||||
$allCategories = Db::name('article_category')
|
||||
->where('delete_time', null)
|
||||
$allCategories = ArticleCategory::where('delete_time', null)
|
||||
->where('status', 1)
|
||||
->order('sort asc, id asc')
|
||||
->select()
|
||||
@@ -131,7 +127,7 @@ class Articles extends Base
|
||||
'create_time' => time()
|
||||
];
|
||||
|
||||
$insert = Db::name('article')->insert($data);
|
||||
$insert = Article::insert($data);
|
||||
if (empty($insert)) {
|
||||
Log::record('添加文章', 0, '添加文章失败', '文章管理');
|
||||
return json(['code' => 1, 'msg' => '添加失败', 'data' => []]);
|
||||
@@ -139,8 +135,7 @@ class Articles extends Base
|
||||
Log::record('添加文章', 1, '', '文章管理');
|
||||
return json(['code' => 0, 'msg' => '添加成功', 'data' => []]);
|
||||
} else {
|
||||
$lists = Db::name('article')
|
||||
->order('id DESC')
|
||||
$lists = Article::order('id DESC')
|
||||
->select()
|
||||
->each(function ($item, $key) {
|
||||
$item['create_time'] = time();
|
||||
@@ -169,7 +164,7 @@ class Articles extends Base
|
||||
'update_time' => time()
|
||||
];
|
||||
|
||||
$update = Db::name('article')->where('id', $id)->update($data);
|
||||
$update = Article::where('id', $id)->update($data);
|
||||
if ($update === false) {
|
||||
Log::record('编辑文章', 0, '编辑文章失败', '文章管理');
|
||||
return json(['code' => 1, 'msg' => '更新失败', 'data' => []]);
|
||||
@@ -178,13 +173,12 @@ class Articles extends Base
|
||||
return json(['code' => 0, 'msg' => '更新成功', 'data' => []]);
|
||||
} else {
|
||||
$id = input('get.id');
|
||||
$info = Db::name('article')->where('id', $id)->find();
|
||||
$info = Article::where('id', $id)->find();
|
||||
if ($info === null) {
|
||||
return json(['code' => 1, 'msg' => '文章不存在', 'data' => []]);
|
||||
}
|
||||
|
||||
$cates = Db::name('article_category')
|
||||
->where('delete_time', null)
|
||||
$cates = ArticleCategory::where('delete_time', null)
|
||||
->where('status', 1)
|
||||
->order('sort asc, id asc')
|
||||
->select()
|
||||
@@ -192,8 +186,7 @@ class Articles extends Base
|
||||
|
||||
$info['content'] = !empty($info['content']) ? htmlspecialchars_decode(str_replace(["\r\n", "\r", "\n"], '', addslashes($info['content']))) : '';
|
||||
|
||||
$currentCate = Db::name('article_category')
|
||||
->where('id', $info['cate'])
|
||||
$currentCate = ArticleCategory::where('id', $info['cate'])
|
||||
->where('delete_time', null)
|
||||
->where('status', 1)
|
||||
->find();
|
||||
@@ -214,7 +207,7 @@ class Articles extends Base
|
||||
$data = [
|
||||
'delete_time' => time(),
|
||||
];
|
||||
$delete = Db::name('article')->where('id', $id)->update($data);
|
||||
$delete = Article::where('id', $id)->update($data);
|
||||
if ($delete === false) {
|
||||
Log::record('删除文章', 0, '删除文章失败', '文章管理');
|
||||
return json(['code' => 1, 'msg' => '删除失败', 'data' => []]);
|
||||
@@ -227,8 +220,7 @@ class Articles extends Base
|
||||
public function articlecate()
|
||||
{
|
||||
if (Request::isPost()) {
|
||||
$lists = Db::name('article_category')
|
||||
->where('delete_time', null)
|
||||
$lists = ArticleCategory::where('delete_time', null)
|
||||
->where('status', 1)
|
||||
->order('sort asc, id asc')
|
||||
->select()
|
||||
@@ -270,8 +262,7 @@ class Articles extends Base
|
||||
public function getcate()
|
||||
{
|
||||
// 获取所有分类
|
||||
$lists = Db::name('article_category')
|
||||
->where('delete_time', null)
|
||||
$lists = ArticleCategory::where('delete_time', null)
|
||||
->where('status', 1)
|
||||
->order('sort asc, id asc')
|
||||
->select()
|
||||
@@ -313,7 +304,7 @@ class Articles extends Base
|
||||
'create_time' => time()
|
||||
];
|
||||
|
||||
$insert = Db::name('article_category')->insert($data);
|
||||
$insert = ArticleCategory::insert($data);
|
||||
if (empty($insert)) {
|
||||
Log::record('添加文章分类', 0, '添加文章分类失败', '文章分类');
|
||||
return json(['code' => 1, 'msg' => '添加失败', 'data' => []]);
|
||||
@@ -322,8 +313,7 @@ class Articles extends Base
|
||||
return json(['code' => 0, 'msg' => '添加成功', 'data' => []]);
|
||||
} else {
|
||||
// 获取所有可选的父级分类
|
||||
$parentCategories = Db::name('article_category')
|
||||
->where('delete_time', null)
|
||||
$parentCategories = ArticleCategory::where('delete_time', null)
|
||||
->where('status', 1)
|
||||
->where('cid', 0)
|
||||
->field('id, name')
|
||||
@@ -354,8 +344,7 @@ class Articles extends Base
|
||||
'update_time' => time()
|
||||
];
|
||||
|
||||
$update = Db::name('article_category')
|
||||
->where('id', $data['id'])
|
||||
$update = ArticleCategory::where('id', $data['id'])
|
||||
->update($data);
|
||||
|
||||
if ($update === false) {
|
||||
@@ -366,11 +355,10 @@ class Articles extends Base
|
||||
return json(['code' => 0, 'msg' => '更新成功', 'data' => []]);
|
||||
} else {
|
||||
$id = input('get.id');
|
||||
$info = Db::name('article_category')->where('id', $id)->find();
|
||||
$info = ArticleCategory::where('id', $id)->find();
|
||||
|
||||
// 获取所有可选的父级分类
|
||||
$parentCategories = Db::name('article_category')
|
||||
->where('delete_time', null)
|
||||
$parentCategories = ArticleCategory::where('delete_time', null)
|
||||
->where('status', 1)
|
||||
->where('id', '<>', $id) // 排除自己
|
||||
->where(function ($query) use ($id) {
|
||||
@@ -409,8 +397,7 @@ class Articles extends Base
|
||||
$id = input('post.id');
|
||||
|
||||
// 检查是否有子分类
|
||||
$hasChildren = Db::name('article_category')
|
||||
->where('cid', $id)
|
||||
$hasChildren = ArticleCategory::where('cid', $id)
|
||||
->where('delete_time', null)
|
||||
->find();
|
||||
|
||||
@@ -419,8 +406,7 @@ class Articles extends Base
|
||||
return json(['code' => 1, 'msg' => '该分类下有子分类,无法删除', 'data' => []]);
|
||||
}
|
||||
|
||||
$delete = Db::name('article_category')
|
||||
->where('id', $id)
|
||||
$delete = ArticleCategory::where('id', $id)
|
||||
->update(['delete_time' => time()]);
|
||||
|
||||
if ($delete === false) {
|
||||
@@ -433,8 +419,7 @@ class Articles extends Base
|
||||
|
||||
//统计文章数量
|
||||
public function counts() {
|
||||
$total = Db::name('article')
|
||||
->where('delete_time', null)
|
||||
$total = Article::where('delete_time', null)
|
||||
->where('status', '<>', 3)
|
||||
->count();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user