调整所有返工接口的响应返回数据，为兼容RPC调用做支持
This commit is contained in:
柳清爽
@@ -5,6 +5,7 @@ namespace app\superadmin\controller\administrator;
|
||||
use app\common\model\Administrator as AdministratorModel;
|
||||
use app\common\model\AdministratorPermissions as AdministratorPermissionsModel;
|
||||
use app\superadmin\controller\BaseController;
|
||||
use library\ResponseHelper;
|
||||
use think\Controller;
|
||||
use think\Db;
|
||||
use think\Validate;
|
||||
@@ -41,12 +42,12 @@ class AddAdministratorController extends BaseController
|
||||
{
|
||||
$validate = Validate::make([
|
||||
'account' => 'require|/\S+/',
|
||||
'name' => 'require|/\S+/',
|
||||
'username' => 'require|/\S+/',
|
||||
'password' => 'require|/\S+/',
|
||||
'permissionIds' => 'require|array',
|
||||
], [
|
||||
'account.require' => '账号不能为空',
|
||||
'name.require' => '姓名不能为空',
|
||||
'username.require' => '用户名不能为空',
|
||||
'password.require' => '密码不能为空',
|
||||
'permissionIds.require' => '请至少分配一种权限',
|
||||
]);
|
||||
@@ -125,7 +126,7 @@ class AddAdministratorController extends BaseController
|
||||
public function index()
|
||||
{
|
||||
try {
|
||||
$params = $this->request->only(['account', 'name', 'password', 'permissionIds']);
|
||||
$params = $this->request->only(['account', 'username', 'password', 'permissionIds']);
|
||||
|
||||
$this->dataValidate($params);
|
||||
$this->checkPermission()->chekAdminIsExist($params['account']);
|
||||
@@ -140,17 +141,10 @@ class AddAdministratorController extends BaseController
|
||||
|
||||
Db::commit();
|
||||
|
||||
return json([
|
||||
'code' => 200,
|
||||
'msg' => '添加成功',
|
||||
]);
|
||||
return ResponseHelper::success();
|
||||
} catch (\Exception $e) {
|
||||
Db::rollback();
|
||||
|
||||
return json([
|
||||
'code' => $e->getCode(),
|
||||
'msg' => $e->getMessage()
|
||||
]);
|
||||
return ResponseHelper::error($e->getMessage(), $e->getCode());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,7 @@ namespace app\superadmin\controller\administrator;
|
||||
use app\superadmin\controller\BaseController;
|
||||
use app\common\model\Administrator as AdministratorModel;
|
||||
use app\common\model\AdministratorPermissions as AdministratorPermissionsModel;
|
||||
use library\ResponseHelper;
|
||||
use think\Controller;
|
||||
use think\Db;
|
||||
use think\Validate;
|
||||
@@ -118,17 +119,10 @@ class DeleteAdministratorController extends BaseController
|
||||
|
||||
Db::commit();
|
||||
|
||||
return json([
|
||||
'code' => 200,
|
||||
'msg' => '删除成功',
|
||||
]);
|
||||
return ResponseHelper::success();
|
||||
} catch (\Exception $e) {
|
||||
Db::rollback();
|
||||
|
||||
return json([
|
||||
'code' => $e->getCode(),
|
||||
'msg' => $e->getMessage(),
|
||||
]);
|
||||
return ResponseHelper::error($e->getMessage(), $e->getCode());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,7 @@ namespace app\superadmin\controller\administrator;
|
||||
|
||||
use app\common\model\Administrator as AdministratorModel;
|
||||
use app\superadmin\controller\BaseController;
|
||||
use library\ResponseHelper;
|
||||
use think\Db;
|
||||
|
||||
/**
|
||||
@@ -22,7 +23,7 @@ class GetAdministratorDetailController extends BaseController
|
||||
{
|
||||
$admin = AdministratorModel::alias('a')
|
||||
->field(
|
||||
'a.id, a.account, a.name, a.status, a.authId, a.createTime createdAt, a.lastLoginTime lastLogin, p.permissions'
|
||||
'a.id, a.account, a.username, a.status, a.authId, a.createTime createdAt, a.lastLoginTime lastLogin, p.permissions'
|
||||
)
|
||||
->leftJoin('administrator_permissions p', 'a.id = p.adminId')
|
||||
->where('a.id', $adminId)
|
||||
@@ -91,21 +92,16 @@ class GetAdministratorDetailController extends BaseController
|
||||
$roleName = $this->getRoleName($admin->authId);
|
||||
$permissionIds = $this->parsePermissions($admin->permissions);
|
||||
|
||||
return json([
|
||||
'code' => 200,
|
||||
'msg' => '获取成功',
|
||||
'data' => array_merge($admin->toArray(), [
|
||||
return ResponseHelper::success(
|
||||
array_merge($admin->toArray(), [
|
||||
'roleName' => $roleName,
|
||||
'permissions' => $permissionIds,
|
||||
'lastLogin' => $admin->lastLogin ? date('Y-m-d H:i', $admin->lastLogin) : '从未登录',
|
||||
'createdAt' => date('Y-m-d H:i', $admin->createdAt),
|
||||
])
|
||||
]);
|
||||
);
|
||||
} catch (\Exception $e) {
|
||||
return json([
|
||||
'code' => $e->getCode(),
|
||||
'msg' => $e->getMessage()
|
||||
]);
|
||||
return ResponseHelper::error($e->getMessage(), $e->getCode());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,7 @@ namespace app\superadmin\controller\administrator;
|
||||
use app\common\model\Administrator as AdministratorModel;
|
||||
use app\common\model\AdministratorPermissions as AdministratorPermissionsModel;
|
||||
use app\common\model\Menu as MenuModel;
|
||||
use library\ResponseHelper;
|
||||
use think\Controller;
|
||||
|
||||
/**
|
||||
@@ -24,7 +25,7 @@ class GetAdministratorListController extends Controller
|
||||
|
||||
// 如果有搜索关键词
|
||||
if (!empty($keyword = $this->request->param('keyword/s', ''))) {
|
||||
$where[] = ['account|name', 'like', "%{$keyword}%"];
|
||||
$where[] = ['account|username', 'like', "%{$keyword}%"];
|
||||
}
|
||||
|
||||
return array_merge($params, $where);
|
||||
@@ -34,15 +35,13 @@ class GetAdministratorListController extends Controller
|
||||
* 获取管理员列表
|
||||
*
|
||||
* @param array $where 查询条件
|
||||
* @param int $page 页码
|
||||
* @param int $limit 每页数量
|
||||
* @return \think\Paginator 分页对象
|
||||
*/
|
||||
protected function getAdministratorList(array $where): \think\Paginator
|
||||
{
|
||||
$query = AdministratorModel::alias('a')
|
||||
->field(
|
||||
'id, account, name, status, authId, createTime createdAt, lastLoginTime, lastLoginIp'
|
||||
'id, account, username, status, authId, createTime createdAt, lastLoginTime, lastLoginIp'
|
||||
);
|
||||
|
||||
foreach ($where as $key => $value) {
|
||||
@@ -141,8 +140,8 @@ class GetAdministratorListController extends Controller
|
||||
foreach ($list->items() as $item) {
|
||||
$section = [
|
||||
'id' => $item->id,
|
||||
'username' => $item->account,
|
||||
'name' => $item->name,
|
||||
'account' => $item->account,
|
||||
'username' => $item->username,
|
||||
'status' => $item->status,
|
||||
'createdAt' => date('Y-m-d H:i:s', $item->createdAt),
|
||||
'lastLogin' => !empty($item->lastLoginTime) ? date('Y-m-d H:i:s', $item->lastLoginTime) : '从未登录',
|
||||
@@ -166,13 +165,11 @@ class GetAdministratorListController extends Controller
|
||||
$where = $this->makeWhere();
|
||||
$result = $this->getAdministratorList($where);
|
||||
|
||||
return json([
|
||||
'code' => 200,
|
||||
'msg' => '获取成功',
|
||||
'data' => [
|
||||
return ResponseHelper::success(
|
||||
[
|
||||
'list' => $this->makeReturnedResult($result),
|
||||
'total' => $result->total(),
|
||||
]
|
||||
]);
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,7 @@ namespace app\superadmin\controller\administrator;
|
||||
use app\common\model\Administrator as AdministratorModel;
|
||||
use app\common\model\AdministratorPermissions as AdministratorPermissionsModel;
|
||||
use app\superadmin\controller\BaseController;
|
||||
use library\ResponseHelper;
|
||||
use think\Db;
|
||||
use think\Validate;
|
||||
|
||||
@@ -49,13 +50,13 @@ class UpdateAdministratorController extends BaseController
|
||||
$validate = Validate::make([
|
||||
'id' => 'require|regex:/^[1-9]\d*$/',
|
||||
'account' => 'require|/\S+/',
|
||||
'name' => 'require|/\S+/',
|
||||
'username' => 'require|/\S+/',
|
||||
'password' => '/\S+/',
|
||||
'permissionIds' => 'array',
|
||||
], [
|
||||
'id.require' => '缺少必要参数',
|
||||
'account.require' => '账号不能为空',
|
||||
'name.require' => '姓名不能为空',
|
||||
'username.require' => '用户名不能为空',
|
||||
'permissionIds.array' => '请至少分配一种权限',
|
||||
]);
|
||||
|
||||
@@ -123,7 +124,7 @@ class UpdateAdministratorController extends BaseController
|
||||
public function index()
|
||||
{
|
||||
try {
|
||||
$params = $this->request->only(['id', 'account', 'name', 'password', 'permissionIds']);
|
||||
$params = $this->request->only(['id', 'account', 'username', 'password', 'permissionIds']);
|
||||
|
||||
// 被修改的管理员id
|
||||
$adminId = $params['id'] ?? 0;
|
||||
@@ -143,18 +144,10 @@ class UpdateAdministratorController extends BaseController
|
||||
}
|
||||
|
||||
Db::commit();
|
||||
|
||||
return json([
|
||||
'code' => 200,
|
||||
'msg' => '更新成功',
|
||||
]);
|
||||
return ResponseHelper::success();
|
||||
} catch (\Exception $e) {
|
||||
Db::rollback();
|
||||
|
||||
return json([
|
||||
'code' => $e->getCode(),
|
||||
'msg' => $e->getMessage()
|
||||
]);
|
||||
return ResponseHelper::error($e->getMessage(), $e->getCode());
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user