fnvtk/cunkebao_v3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整所有返工接口的响应返回数据，为兼容RPC调用做支持

Browse Source
This commit is contained in:
柳清爽
2025-04-22 15:04:38 +08:00
parent 0503260040
commit 0896686934
27 changed files with 132 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Server/application/superadmin/controller/Menu/GetMenuTreeController.php
View File

@@ -5,6 +5,7 @@ namespace app\superadmin\controller\Menu;
use app\common\model\Menu as MenuModel;
use app\common\model\AdministratorPermissions as AdministratorPermissionsModel;
use app\superadmin\controller\BaseController;
use library\ResponseHelper;
use think\facade\Cache;
/**
@@ -182,10 +183,6 @@ class GetMenuTreeController extends BaseController
);
}
return json([
'code' => 200,
'msg' => '获取成功',
'data' => $menuTree
]);
return ResponseHelper::success($menuTree);
}
}

18
Server/application/superadmin/controller/administrator/AddAdministratorController.php
View File

@@ -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());
}
}
}

12
Server/application/superadmin/controller/administrator/DeleteAdministratorController.php
View File

@@ -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());
}
}
}

16
Server/application/superadmin/controller/administrator/GetAdministratorDetailController.php
View File

@@ -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());
}
}
}

19
Server/application/superadmin/controller/administrator/GetAdministratorListController.php
View File

@@ -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(),
]
]);
);
}
}

19
Server/application/superadmin/controller/administrator/UpdateAdministratorController.php
View File

@@ -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());
}
}
}

20
Server/application/superadmin/controller/auth/AuthLoginController.php
View File

@@ -4,6 +4,7 @@ namespace app\superadmin\controller\auth;
use app\common\model\Administrator as AdministratorModel;
use app\superadmin\controller\administrator\DeleteAdministratorController;
use library\ResponseHelper;
use think\Controller;
use think\Validate;
@@ -14,7 +15,7 @@ class AuthLoginController extends Controller
* @param DeleteAdministratorController $admin
* @return string
*/
protected function createToken($admin): string
protected function createToken(AdministratorModel $admin): string
{
return md5($admin->id . '|' . $admin->account . 'cunkebao_admin_secret');
}
@@ -41,6 +42,8 @@ class AuthLoginController extends Controller
}
/**
* 获取管理员信息
*
* @param array $params
* @return object|AdministratorModel
* @throws \Exception
@@ -108,21 +111,16 @@ class AuthLoginController extends Controller
$admin = $this->dataValidate($params)->getAdministrator($params);
$this->saveLoginInfo($admin)->setCookie($admin);
return json([
'code' => 200,
'msg' => '登录成功',
'data' => [
return ResponseHelper::success(
[
'id' => $admin->id,
'name' => $admin->name,
'name' => $admin->username,
'account' => $admin->account,
'token' => cookie('admin_token')
]
]);
);
} catch (\Exception $e) {
return json([
'code' => $e->getCode(),
'msg' => $e->getMessage()
]);
return ResponseHelper::error($e->getMessage(), $e->getCode());
}
}
}

19
Server/application/superadmin/controller/company/CreateCompanyController.php
View File

@@ -4,9 +4,10 @@ namespace app\superadmin\controller\company;
use app\common\model\Company as CompanyModel;
use app\common\model\User as UsersModel;
use app\library\s2\CurlHandle;
use app\superadmin\controller\BaseController;
use Eison\Utils\Helper\ArrHelper;
use library\ResponseHelper;
use library\s2\CurlHandle;
use think\Db;
use think\facade\Env;
use think\Validate;
@@ -167,20 +168,14 @@ class CreateCompanyController extends BaseController
$params = $this->dataValidate($params)->creatS2About($params);
Db::startTrans();
$this->createCkbAbout($params);
Db::commit();
return json([
'code' => 200,
'msg' => '创建成功'
]);
$this->createCkbAbout($params);
Db::commit();
return ResponseHelper::success();
} catch (\Exception $e) {
Db::rollback();
return json([
'code' => $e->getCode(),
'msg' => $e->getMessage()
]);
return ResponseHelper::error($e->getMessage(), $e->getCode());
}
}
}

19
Server/application/superadmin/controller/company/DeleteCompanyController.php
View File

@@ -5,6 +5,7 @@ namespace app\superadmin\controller\company;
use app\common\model\Company as CompanyModel;
use app\common\model\User as UserModel;
use app\superadmin\controller\BaseController;
use library\ResponseHelper;
use think\Db;
use think\Validate;
@@ -111,23 +112,15 @@ class DeleteCompanyController extends BaseController
$params = $this->request->only('id');
$companId = $params['id'];
$this->dataValidate($params);
Db::startTrans();
$this->delteCkbAbout($companId)->deleteS2About($companId);
Db::commit();
return json([
'code' => 200,
'msg' => '删除成功'
]);
$this->dataValidate($params)->delteCkbAbout($companId)->deleteS2About($companId);
Db::commit();
return ResponseHelper::success();
} catch (\Exception $e) {
Db::rollback();
return json([
'code' => $e->getCode(),
'msg' => $e->getMessage()
]);
return ResponseHelper::error($e->getMessage(), $e->getCode());
}
}
}

14
Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php
View File

@@ -5,6 +5,7 @@ namespace app\superadmin\controller\company;
use app\common\model\Company as CompanyModel;
use app\common\model\Device as DeviceModel;
use app\superadmin\controller\BaseController;
use library\ResponseHelper;
/**
* 公司控制器
@@ -64,16 +65,11 @@ class GetCompanyDetailForUpdateController extends BaseController
$data = $this->getCompanyDetail($id);
$devices = $this->getDevicesByCompanyId($data['companyId']);
return json([
'code' => 200,
'msg' => '获取成功',
'data' => array_merge($data, compact('devices')),
]);
return ResponseHelper::success(
array_merge($data, compact('devices'))
);
} catch (\Exception $e) {
return json([
'code' => $e->getCode(),
'msg' => $e->getMessage()
]);
return ResponseHelper::error($e->getMessage(), $e->getCode());
}
}
}

9
Server/application/superadmin/controller/company/GetCompanyListController.php
View File

@@ -7,6 +7,7 @@ use app\common\model\Device as DeviceModel;
use app\common\model\User as usersModel;
use app\superadmin\controller\BaseController;
use Eison\Utils\Helper\ArrHelper;
use library\ResponseHelper;
/**
* 公司控制器
@@ -115,13 +116,11 @@ class GetCompanyListController extends BaseController
$where = $this->makeWhere();
$result = $this->getCompanyList($where);
return json([
'code' => 200,
'msg' => '获取成功',
'data' => [
return ResponseHelper::success(
[
'list' => $this->makeReturnedResult($result),
'total' => $result->total(),
]
]);
);
}
}

16
Server/application/superadmin/controller/company/UpdateCompanyController.php
View File

@@ -6,6 +6,7 @@ use app\common\model\Company as CompanyModel;
use app\common\model\User as UsersModel;
use app\superadmin\controller\BaseController;
use Eison\Utils\Helper\ArrHelper;
use library\ResponseHelper;
use think\Db;
use think\Validate;
@@ -99,6 +100,8 @@ class UpdateCompanyController extends BaseController
}
/**
* 更新存客宝端数据
*
* @param array $params
* @return self
* @throws \Exception
@@ -115,6 +118,8 @@ class UpdateCompanyController extends BaseController
}
/**
* 更新触客宝端数据
*
* @param array $params
* @return self
* @throws \Exception
@@ -208,17 +213,10 @@ class UpdateCompanyController extends BaseController
$this->updateCkbAbout($params)->updateS2About($params);
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());
}
}
}

11
Server/application/superadmin/controller/dashboard/GetBasestatisticsController.php
View File

@@ -4,6 +4,7 @@ namespace app\superadmin\controller\dashboard;
use app\common\model\Administrator as AdministratorModel;
use app\common\model\Company as CompanyModel;
use library\ResponseHelper;
use think\Controller;
/**
@@ -48,14 +49,12 @@ class GetBasestatisticsController extends Controller
*/
public function index()
{
return json([
'code' => 200,
'msg' => '获取成功',
'data' => [
return ResponseHelper::success(
[
'companyCount' => $this->getCompanyCount(),
'adminCount' => $this->getAdminCount(),
'adminCount' => $this->getAdminCount(),
'customerCount' => $this->getCustomerCount(),
]
]);
);
}
}

9
Server/application/superadmin/controller/traffic/GetPoolListController.php
View File

@@ -4,6 +4,7 @@ namespace app\superadmin\controller\traffic;
use app\common\model\TrafficPool as TrafficPoolModel;
use app\superadmin\controller\BaseController;
use library\ResponseHelper;
use think\facade\Request;
/**
@@ -105,15 +106,13 @@ class GetPoolListController extends BaseController
{
$list = $this->gePoolList();
return json([
'code' => 200,
'msg' => '获取成功',
'data' => [
return ResponseHelper::success(
[
'list' => $this->makeReturnedValue($list)->items(),
'total' => $list->total(),
'page' => $list->currentPage(),
'limit' => $list->listRows()
]
]);
);
}
}