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

crud调整

Browse Source
This commit is contained in:
chenlan
2025-07-21 15:09:06 +08:00
parent 228408149b
commit 45679bc5e4
15 changed files with 318 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/controller/RoleController.php
+102 -83
View File
@@ -2,97 +2,116 @@
namespace app\admin\controller;
use app\common\validate\RoleValidate;
use app\common\service\RoleService;
use support\Request;
use app\common\controller\BaseController;
use app\admin\service\RoleService;
use app\common\traits\crud\CrudControllerTrait;
class RoleController extends \app\common\controller\BaseController
class RoleController extends BaseController
{
/**
* 获取角色列表
*/
public function list(Request $request)
use CrudControllerTrait;
protected $service;
public function __construct()
{
try {
$params = $request->all();
$result = (new RoleService())->getRoleList($params);
// 定义后处理器
$postProcessor = function($formattedData) {
if (isset($formattedData['created_at']))
$formattedData['created_at'] = date('Y-m-d H:i:s', $formattedData['created_at']);
if (isset($formattedData['updated_at']))
$formattedData['updated_at'] = date('Y-m-d H:i:s', $formattedData['updated_at']);
return $formattedData;
};
return $this->success($this->transformData($result, $postProcessor), '角色列表获取成功');
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
$this->service = new RoleService();
}
/**
* 获取角色详情
*/
public function detail(Request $request)
protected function indexFormat($data)
{
try {
$roleId = $request->get('role_id');
if (!$roleId) {
return $this->error('缺少角色ID', 422);
}
$result = (new RoleService())->getRoleDetail($roleId);
return $this->success($result, '角色详情获取成功');
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
if (isset($data['updated_at']))
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
return $data;
}
/**
* 增加角色
*/
public function create(Request $request)
{
try {
$data = $this->validate(new RoleValidate(), $request->post(), 'role_create');
$result = (new RoleService())->createRole($data);
return $this->success($result, '角色创建成功');
} catch (\think\exception\ValidateException $e) {
return $this->error($e->getError(), 422);
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
}
// /**
// * 获取角色列表
// */
// public function list(Request $request)
// {
// try {
// $params = $request->all();
// $result = (new RoleService())->getRoleList($params);
// // 定义后处理器
// $postProcessor = function($formattedData) {
// if (isset($formattedData['created_at']))
// $formattedData['created_at'] = date('Y-m-d H:i:s', $formattedData['created_at']);
// if (isset($formattedData['updated_at']))
// $formattedData['updated_at'] = date('Y-m-d H:i:s', $formattedData['updated_at']);
// return $formattedData;
// };
// return $this->success($this->transformData($result, $postProcessor), '角色列表获取成功');
// } catch (\Throwable $e) {
// return $this->error($e->getMessage());
// }
// }
/**
* 修改角色
*/
public function update(Request $request)
{
try {
$data = $this->validate(new RoleValidate(), $request->post(), 'role_update');
$result = (new RoleService())->updateRole($data);
return $this->success($result, '角色更新成功');
} catch (\think\exception\ValidateException $e) {
return $this->error($e->getError(), 422);
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
}
// /**
// * 获取角色详情
// */
// public function detail(Request $request)
// {
// try {
// $roleId = $request->get('role_id');
// if (!$roleId) {
// return $this->error('缺少角色ID', 422);
// }
// $result = (new RoleService())->getRoleDetail($roleId);
// return $this->success($result, '角色详情获取成功');
// } catch (\Throwable $e) {
// return $this->error($e->getMessage());
// }
// }
/**
* 删除角色
*/
public function delete(Request $request)
{
try {
$roleId = $request->get('role_id');
if (!$roleId) {
return $this->error('缺少角色ID', 422);
}
(new RoleService())->deleteRole($roleId);
return $this->success([], '角色删除成功');
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
}
// /**
// * 增加角色
// */
// public function create(Request $request)
// {
// try {
// $data = $this->validate(new RoleValidate(), $request->post(), 'role_create');
// $result = (new RoleService())->createRole($data);
// return $this->success($result, '角色创建成功');
// } catch (\think\exception\ValidateException $e) {
// return $this->error($e->getError(), 422);
// } catch (\Throwable $e) {
// return $this->error($e->getMessage());
// }
// }
// /**
// * 修改角色
// */
// public function update(Request $request)
// {
// try {
// $data = $this->validate(new RoleValidate(), $request->post(), 'role_update');
// $result = (new RoleService())->updateRole($data);
// return $this->success($result, '角色更新成功');
// } catch (\think\exception\ValidateException $e) {
// return $this->error($e->getError(), 422);
// } catch (\Throwable $e) {
// return $this->error($e->getMessage());
// }
// }
// /**
// * 删除角色
// */
// public function delete(Request $request)
// {
// try {
// $roleId = $request->get('role_id');
// if (!$roleId) {
// return $this->error('缺少角色ID', 422);
// }
// (new RoleService())->deleteRole($roleId);
// return $this->success([], '角色删除成功');
// } catch (\Throwable $e) {
// return $this->error($e->getMessage());
// }
// }
}
app/admin/service/CorpService.php
+14 -47
View File
@@ -2,9 +2,9 @@
namespace app\admin\service;
use app\common\validate\CorpValidate;
use app\common\traits\crud\CrudServiceTrait;
use app\common\model\Corp;
use support\Request;
class CorpService
{
@@ -15,6 +15,19 @@ class CorpService
*/
protected string $modelClass = Corp::class;
/**
* 验证器
*/
protected $validator = CorpValidate::class;
/**
* 获取验证器
*/
public function getValidator()
{
return new $this->validator;
}
/**
* 如果需要自定义，比如强制加一个 where['status']=1，
@@ -27,33 +40,6 @@ class CorpService
// return $config;
// }
/**
* 如果需要自定义“哪些字段可筛选”或额外联表，
* 只需重写 buildQueryConfig：
*/
// protected function buildQueryConfig(Request $request): array
// {
// $config = parent::buildQueryConfig($request);
// // 强制只看 status=1 的记录
// $config['where']['status'] = 1;
// // 自动 eager load company relation
// $config['with'][] = 'company';
// return $config;
// }
/**
* 复杂查询，覆盖 complexQuery 方法
*/
// protected function complexQuery(array $params): array
// {
// return $this->logicComplex(function($q) use ($params) {
// // 自定义 join、where、select
// return $q->where('status', 1)
// ->orderBy('created_at','desc')
// ->paginate($params['limit'] ?? 15);
// })->toArray();
// }
// /**
// * 复杂查询示例：
// * 只要在 URL 里添加 ?complex_query=1，
@@ -100,23 +86,4 @@ class CorpService
// $res['data'] = array_map(fn($i)=>[...], $res['data']);
// return $res;
// }
// protected function afterServiceShow($item)
// {
// // 对详情对象处理
// $item['extra']=123;
// return $item;
// }
// afterServiceStore/Update/Destroy 同理
// protected function afterServiceList(mixed $result): array
// {
// if ($result['records']) {
// $result['records'] = array_map(fn($i) => [...$i], $result['records']);
// }
// return $result;
// }
}
app/admin/service/RoleService.php
+31
View File
@@ -0,0 +1,31 @@
<?php
namespace app\admin\service;
use app\common\validate\RoleValidate;
use app\common\traits\crud\CrudServiceTrait;
use app\common\model\Role;
class RoleService
{
use CrudServiceTrait;
/**
* 指定当前要操作的模型
*/
protected string $modelClass = Role::class;
/**
* 验证器
*/
protected $validator = RoleValidate::class;
/**
* 获取验证器
*/
public function getValidator()
{
return new $this->validator;
}
}