yunzerwebsite/yunzer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.yunzer.cn/yunzerwebsite/yunzer

Browse Source
This commit is contained in:
云泽网
2025-05-20 23:32:46 +08:00
parent d148d818a1 709915e6a7
commit ade061223e
20 changed files with 2658 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/controller/ResourcesController.php
+22 -21
View File
@@ -23,12 +23,12 @@ class ResourcesController extends BaseController
'name' => input('post.name'),
'uploader' => input('post.uploader')
];
$page = (int)input('post.page', 1);
$limit = (int)input('post.limit', 10);
$page = (int) input('post.page', 1);
$limit = (int) input('post.limit', 10);
$query = Resource::where('delete_time', null)
->where('status', 1);
// 分类筛选
if (!empty($params['category'])) {
$cateInfo = ResourceCategory::where('name', $params['category'])
@@ -36,20 +36,20 @@ class ResourcesController extends BaseController
->where('status', 1)
->field('id')
->find();
if ($cateInfo) {
$query = $query->where('cate', (int)$cateInfo['id']);
$query = $query->where('cate', (int) $cateInfo['id']);
}
}
// 名称搜索
if (!empty($params['name'])) {
$query = $query->where('name', 'like', '%'.$params['name'].'%');
$query = $query->where('name', 'like', '%' . $params['name'] . '%');
}
// 上传者搜索
if (!empty($params['uploader'])) {
$query = $query->where('uploader', 'like', '%'.$params['uploader'].'%');
$query = $query->where('uploader', 'like', '%' . $params['uploader'] . '%');
}
$count = $query->count();
@@ -59,7 +59,7 @@ class ResourcesController extends BaseController
->select()
->each(function ($item) {
// 获取分类信息
$cateInfo = ResourceCategory::where('id', (int)$item['cate'])
$cateInfo = ResourceCategory::where('id', (int) $item['cate'])
->field('name, icon')
->find();
if ($cateInfo) {
@@ -68,7 +68,7 @@ class ResourcesController extends BaseController
$item['icon'] = $cateInfo['icon'];
}
}
$item['create_time'] = date('Y-m-d H:i:s', (int)$item['create_time']);
$item['create_time'] = date('Y-m-d H:i:s', (int) $item['create_time']);
return $item;
});
@@ -85,7 +85,7 @@ class ResourcesController extends BaseController
->order('sort asc, id asc')
->select()
->toArray();
$categories = $this->buildParentChild($allCategories);
View::assign([
@@ -104,12 +104,13 @@ class ResourcesController extends BaseController
'cate' => input('post.cate'),
'icon' => input('post.icon'),
'url' => input('post.url'),
'fileurl' => input('post.fileurl'),
'code' => input('post.code'),
'uploader' => input('post.uploader'),
'desc' => input('post.desc'),
'content' => input('post.content'),
'number' => input('post.number'),
'status' => input('post.status', 2),
'status' => input('post.status', 1),
'create_time' => time()
];
@@ -376,7 +377,7 @@ class ResourcesController extends BaseController
$resource = Resource::where('id', $id)
->where('delete_time', null)
->find();
if (!$resource) {
Log::record('获取资源详情', 0, '资源不存在', '资源管理');
return json(['code' => 1, 'msg' => '资源不存在']);
@@ -403,42 +404,42 @@ class ResourcesController extends BaseController
$total = Resource::where('delete_time', null)
->where('status', '<>', 3)
->count();
// 获取今日新增资源数
$today = strtotime(date('Y-m-d'));
$todayNew = Resource::where('delete_time', null)
->where('status', '<>', 3)
->where('create_time', '>=', $today)
->count();
// 获取最近7天的资源数据
$dates = [];
$counts = [];
$totalCounts = []; // 存储每天的总资源数
for ($i = 6; $i >= 0; $i--) {
$date = date('Y-m-d', strtotime("-$i days"));
$start = strtotime($date);
$end = $start + 86400;
// 获取当天新增资源数
$count = Resource::where('delete_time', null)
->where('status', '<>', 3)
->where('create_time', '>=', $start)
->where('create_time', '<', $end)
->count();
// 获取截至当天的总资源数
$totalCount = Resource::where('delete_time', null)
->where('status', '<>', 3)
->where('create_time', '<', $end)
->count();
$dates[] = $date;
$counts[] = $count;
$totalCounts[] = $totalCount;
}
return json([
'code' => 0,
'msg' => '获取成功',
@@ -469,7 +470,7 @@ class ResourcesController extends BaseController
'title' => $item['name'],
'children' => []
];
// 查找子分类
foreach ($lists as $subItem) {
if ($subItem['cid'] == $item['id']) {
@@ -480,7 +481,7 @@ class ResourcesController extends BaseController
];
}
}
$tree[] = $node;
}
}