Ggy_shinidie/NewTicket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #1

Merged
Ggy_shinidie merged 14 commits from dev into main 2026-08-14 13:44:59 +08:00
Conversation 0 Commits 14 Files Changed 25 +39 -37
8 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e831ce810b - Show all commits

21
app/admin/controller/AccountManagement.php
View File

@@ -11,7 +11,7 @@ class AccountManagement extends BaseController
public function getAllUsers(AccountService $accountService)
{
$result = $accountService->getAllUsers();
return json(['code' => 200, 'message' => '查询成功', 'data' => $result]);
return $this->success('查询成功', $result);
}
/* 注册用户 */
@@ -23,20 +23,15 @@ class AccountManagement extends BaseController
# 参数校验
if (empty($params['username'])) {
return json(['code' => 400, 'message' => '缺少必要参数']);
return $this->error('缺少必要参数');
}
# 业务逻辑
try {
$result = $accountService->createAccount($params);
return json(['code' => 200, 'message' => '账户创建成功', 'data' => $result]);
return $this->success('账户创建成功', $result);
} catch (\Exception $e) {
return json([
'code' => 400,
'message' => $e->getMessage(),
'data' => null
]);
return $this->error($e->getMessage());
}
}
@@ -45,9 +40,9 @@ class AccountManagement extends BaseController
{
try {
$result = $accountService->updateAccountStatus($id, $status);
return json(['code' => 200, 'message' => '账户状态更新成功', 'data' => $result]);
return $this->success('账户状态更新成功', $result);
} catch (\Exception $e) {
return json(['code' => 400, 'message' => $e->getMessage(), 'data' => null]);
return $this->error($e->getMessage());
}
}
@@ -56,9 +51,9 @@ class AccountManagement extends BaseController
{
try {
$result = $accountService->deleteAccount($id);
return json(['code' => 200, 'message' => '账户删除成功', 'data' => $result]);
return $this->success('账户删除成功', $result);
} catch (\Exception $e) {
return json(['code' => 400, 'message' => $e->getMessage(), 'data' => null]);
return $this->error($e->getMessage());
}
}
}

20
app/admin/controller/CompanyAndOperators.php
View File

@@ -14,7 +14,7 @@ class CompanyAndOperators extends BaseController
public function getAllOperators(TicketService $ticketService)
{
$result = $ticketService->getAllOperators();
return json(['code' => 200, 'msg' => '查询成功', 'data' => $result]);
return $this->success('查询成功', $result);
}
@@ -24,7 +24,7 @@ class CompanyAndOperators extends BaseController
$result = $ticketService->TestgetAllOperators();
return json(['code' => 200, 'msg' => '查询成功', 'data' => $result]);
return $this->success('查询成功', $result);
}
@@ -36,7 +36,7 @@ class CompanyAndOperators extends BaseController
public function getStaffList(TicketService $ticketService)
{
$result = $ticketService->getStaffList();
return json(['code' => 200, 'msg' => '查询成功', 'data' => $result]);
return $this->success('查询成功', $result);
}
@@ -46,7 +46,7 @@ class CompanyAndOperators extends BaseController
$result = $CompanyOperatorService->deleteOperator($id);
return json(['code' => 200, 'msg' => '删除成功', 'data' => $result]);
return $this->success('删除成功', $result);
}
/* 删除客户单位 */
@@ -54,9 +54,9 @@ class CompanyAndOperators extends BaseController
{
$result = $CompanyOperatorService->deleteCompany($id);
if (!$result) {
return json(['code' => 400, 'msg' => '删除失败', 'data' => null]);
return $this->error('删除失败');
}
return json(['code' => 200, 'msg' => '删除成功']);
return $this->success('删除成功');
}
@@ -66,9 +66,9 @@ class CompanyAndOperators extends BaseController
$data = $this->request->post();
try {
$result = $CompanyOperatorService->addCompany($data);
return json(['code' => 200, 'msg' => '创建成功', 'data' => $result]);
return $this->success('创建成功', $result);
} catch (\Exception $e) {
return json(['code' => 400, 'msg' => $e->getMessage(), 'data' => null]);
return $this->error($e->getMessage());
}
}
@@ -78,9 +78,9 @@ class CompanyAndOperators extends BaseController
$data = $this->request->post();
try {
$result = $CompanyOperatorService->addOperator($data);
return json(['code' => 200, 'msg' => '创建成功', 'data' => $result]);
return $this->success('创建成功', $result);
} catch (\Exception $e) {
return json(['code' => 400, 'msg' => $e->getMessage(), 'data' => null]);
return $this->error($e->getMessage());
}
}

6
app/admin/controller/Utill.php
View File

@@ -19,12 +19,12 @@ class Utill extends BaseController
# session中获取当前登录是否是管理员
$isAdmin = Session::get('user_info.role') === 'admin' ? true : false; // 后续用来判断
if (!$isAdmin) {
return json(['code' => 403, 'msg' => '权限不足', 'data' => []]);
return $this->error('权限不足', [], 403);
}
$data = $UtillService->getExportData($range);
return json(['code' => 200, 'msg' => '查询成功', 'data' => $data]);
return $this->success('查询成功', $data);
} catch (\Exception $e) {
return json(['code' => 500, 'msg' => '查询失败', 'data' => []]);
return $this->error('查询失败', [], 500);
}
}
}

7
app/admin/middleware/Auth.php
View File

@@ -2,10 +2,13 @@
namespace app\admin\middleware;
use app\common\Trait\ApiResponse;
use think\facade\Session;
class Auth
{
use ApiResponse;
/**
* 无需 admin 角色即可访问的路由名称（方法名小写）
*/
@@ -31,7 +34,7 @@ class Auth
public function handle($request, \Closure $next)
{
if (!Session::has('user_info')) {
return json(['code' => 401, 'msg' => '未登录，请先登录']);
return $this->error('未登录，请先登录', [], 401);
}
$user = Session::get('user_info');
@@ -45,7 +48,7 @@ class Auth
// admin 专用接口
if (in_array($action, $this->adminActions) && $role !== 'admin') {
return json(['code' => 403, 'msg' => '权限不足，仅管理员可执行此操作']);
return $this->error('权限不足，仅管理员可执行此操作', [], 403);
}
return $next($request);

9
app/common/service/AuthService.php
View File

@@ -29,13 +29,14 @@ class AuthService
$userInfo = [
'id' => $user['id'], // 用户ID
'id' => $user['id'], // 用户ID
'company_id' => $user['company_id'], // 所属公司ID
'company_name' => $user['company']['company_name'], // 所属公司名称
'username' => $user['username'],
'role' => $user['role'],
'username' => $user['username'],
'role' => $user['role'],
];
Session::set('user_info', $user);
Session::set('user_info', $userInfo);
return $userInfo;
}

4
app/index/controller/ClientTicket.php
View File

@@ -16,9 +16,9 @@ class ClientTicket extends BaseController
$clientCompanyId = Session::get('user_info.company_id'); // 获取当前登录客户ID
try {
$tickets = $ClientTicketService->getClientTickets($clientCompanyId);
return json(['code' => 200, 'msg' => '获取成功', 'data' => $tickets]);
return $this->success('获取成功', $tickets);
} catch (\Exception $e) {
return json(['code' => 400, 'msg' => $e->getMessage(), 'data' => null]);
return $this->error($e->getMessage());
}
}
}

4
app/index/controller/Ticket.php
View File

@@ -21,9 +21,9 @@ class Ticket extends BaseController
try {
$result = $ticketService->updateTicket($id, $data, $allowFields, $isUser, false);
return json(['code' => 200, 'msg' => '更新成功', 'data' => $result]);
return $this->success('更新成功', $result);
} catch (\Exception $e) {
return json(['code' => 400, 'msg' => $e->getMessage()]);
return $this->error($e->getMessage());
}
}
}

5
app/middleware/CheckLogin.php
View File

@@ -2,9 +2,12 @@
declare (strict_types = 1);
namespace app\middleware;
use app\common\Trait\ApiResponse;
use think\facade\Session;
class CheckLogin
{
use ApiResponse;
/**
* 处理请求
* @param \think\Request $request
@@ -14,7 +17,7 @@ class CheckLogin
public function handle($request, \Closure $next)
{
if (!Session::has('user_info')) {
return json(['code' => 401, 'message' => '未登录']);
return $this->error('未登录', [], 401);
}
return $next($request);
}