xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增后台

Browse Source
This commit is contained in:
mzl@hnxinyouhe.com
2025-08-12 15:26:17 +08:00
parent 20239dfb6f
commit 360aeec0e1
11 changed files with 372 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/controller/ResourceController.php
+16
View File
@@ -63,4 +63,20 @@ class ResourceController extends BaseController
return $this->error($e->getMessage());
}
}
/**
* 菜单
*/
public function menuTreeList(Request $request)
{
try {
$raw = $this->service->serviceMenuTreeList($request);
$data = $this->transformData($raw, method_exists($this, 'allFormat')
? [$this, 'allFormat']
: null);
return $this->success($data);
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
}
}
app/common/controller/UserController.php
+50 -50
View File
@@ -9,7 +9,7 @@ class UserController extends BaseController
{
/**
* 用户信息
* 用户信息（登录后调用）
*/
public function info(Request $request)
{
@@ -23,57 +23,57 @@ class UserController extends BaseController
}
}
/**
* 用户信息
*/
public function getUser(Request $request)
{
try {
$uid = $request->user->uid;
$corp_abbr = $request->basic_data['corp_abbr'];
$result = (new UserService())->getUser($uid,$corp_abbr);
return $this->success($result, '获取用户信息');
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
}
// /**
// * 用户信息
// */
// public function getUser(Request $request)
// {
// try {
// $uid = $request->user->uid;
// $corp_abbr = $request->basic_data['corp_abbr'];
// $result = (new UserService())->getUser($uid,$corp_abbr);
// return $this->success($result, '获取用户信息');
// } catch (\Throwable $e) {
// return $this->error($e->getMessage());
// }
// }
/**
* 编辑用户
*/
public function edit(Request $request)
{
try {
$uid = $request->user->uid;
$data = $request->all();
$result = (new UserService())->edit($uid,$data);
unset($result['password']);
unset($result['union_id']);
unset($result['open_id']);
unset($result['tenant_key']);
return $this->success($result, '编辑成功');
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
}
// /**
// * 编辑用户
// */
// public function edit(Request $request)
// {
// try {
// $uid = $request->user->uid;
// $data = $request->all();
// $result = (new UserService())->edit($uid,$data);
// unset($result['password']);
// unset($result['union_id']);
// unset($result['open_id']);
// unset($result['tenant_key']);
// return $this->success($result, '编辑成功');
// } catch (\Throwable $e) {
// return $this->error($e->getMessage());
// }
// }
/**
* 修改密码
* @param Request $request
* @return \support\Response
* @throws \Random\RandomException
*/
public function savePassword(Request $request)
{
try {
$uid = $request->user->uid;
$data = $request->all();
$result = (new UserService())->savePassword($uid,$data);;
return $this->success($result, '编辑成功');
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
}
// /**
// * 修改密码
// * @param Request $request
// * @return \support\Response
// * @throws \Random\RandomException
// */
// public function savePassword(Request $request)
// {
// try {
// $uid = $request->user->uid;
// $data = $request->all();
// $result = (new UserService())->savePassword($uid,$data);;
// return $this->success($result, '编辑成功');
// } catch (\Throwable $e) {
// return $this->error($e->getMessage());
// }
// }
}
app/common/logic/ResourceLogic.php
+20
View File
@@ -4,6 +4,7 @@ namespace app\common\logic;
use app\common\traits\crud\CrudLogicTrait;
use app\common\model\Resource;
use support\Request;
class ResourceLogic
{
@@ -14,4 +15,23 @@ class ResourceLogic
*/
protected string $modelClass = Resource::class;
public function logicListAllResources(Request $request, array $config)
{
$data = $this->logicListAll($config);
if ($request->get('role_id')) {
$selected = (new RoleLogic())->getRoleResources($request->get('role_id'));
} else if ($request->get('user_id')) {
$selected = (new RoleLogic())->getUserResources($request->get('user_id'));
} else {
$selected = [];
}
foreach ($data as &$item) {
$item['selected'] = in_array($item['id'], $selected) ? true : false;
}
return $data;
}
}
app/common/logic/RoleLogic.php
+75 -4
View File
@@ -2,13 +2,84 @@
namespace app\common\logic;
use app\common\model\Role;
use support\exception\BusinessException;
use support\Log;
use support\Db;
class RoleLogic
{
/**
* 更新角色资源权限
*
* @param array $data 包含 role_id 和 resources 的数据
* @return bool 操作是否成功
*/
public function updateRoleResources(array $data): bool
{
$roleId = $data['role_id'] ?? 0;
$resources = $data['resources'] ?? [];
if (empty($roleId)) {
return false;
}
Db::beginTransaction();
try {
// 删除原有角色资源关联
Db::table('role_resources')->where('role_id', $roleId)->delete();
// 批量插入新角色资源关联
if (!empty($resources)) {
$insertData = [];
foreach ($resources as $resourceId) {
$insertData[] = [
'role_id' => $roleId,
'resource_id' => $resourceId
];
}
Db::table('role_resources')->insert($insertData);
}
Db::commit();
return true;
} catch (\Throwable $exception) {
Db::rollBack();
return false;
}
}
/**
* 获取角色资源
*
* @param int $roleId 角色ID
* @return array 资源ID列表
*/
public function getRoleResources(int $roleId): array
{
if (empty($roleId)) {
return [];
}
return Db::table('role_resources')
->where('role_id', $roleId)
->pluck('resource_id')
->toArray();
}
/**
* 获取用户资源
*
* @param int $userId 用户ID
* @return array 资源ID列表
*/
public function getUserResources(int $userId): array
{
if (empty($userId)) {
return [];
}
return Db::table('user_resources')
->where('user_id', $userId)
->pluck('resource_id')
->toArray();
}
}
app/common/service/ResourceService.php
+19
View File
@@ -2,6 +2,7 @@
namespace app\common\service;
use app\common\logic\ResourceLogic;
use app\common\validate\ResourceValidate;
use app\common\traits\crud\CrudServiceTrait;
use app\common\model\Resource;
@@ -50,6 +51,11 @@ class ResourceService
$config['order']['sort'] = 'asc';
$config['order']['id'] = 'asc';
break;
case 'menuTreeList':
$config['where']['status'] = 1;
$config['order']['sort'] = 'asc';
$config['order']['id'] = 'asc';
break;
case 'index':
$config['where']['status'] = 1;
$config['order']['sort'] = 'asc';
@@ -79,6 +85,13 @@ class ResourceService
return $this->postProcess('MenuList', $result);
}
public function serviceMenuTreeList(Request $request)
{
$config = $this->buildQueryConfig($request, 'menuTreeList');
$result = (new ResourceLogic())->logicListAllResources($request, $config);
return $this->postProcess('MenuTreeList', $result);
}
protected function afterServiceListAll($data)
{
@@ -91,4 +104,10 @@ class ResourceService
$data = Tree::buildWithReference($data->toArray());
return $data;
}
protected function afterServiceMenuTreeList($data)
{
$data = Tree::buildWithReference($data->toArray());
return $data;
}
}