周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 061ea79fc2db97aed75b12b89a2b1b37b9510be2 2 个父辈 1c40898d 9b1a9584

Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

内嵌 并排对比
正在显示 19 个修改的文件 包含 477 行增加 和 68 行删除
@@ -23,6 +23,8 @@ use App\Models\Project\ProjectWhiteHatAffix; @@ -23,6 +23,8 @@ use App\Models\Project\ProjectWhiteHatAffix;
23 use App\Models\Template\BTemplateMain; 23 use App\Models\Template\BTemplateMain;
24 use App\Models\Template\TemplateTypeMain; 24 use App\Models\Template\TemplateTypeMain;
25 use App\Models\WebSetting\WebSetting; 25 use App\Models\WebSetting\WebSetting;
  26 +use App\Models\WorkOrder\TicketLog;
  27 +use App\Models\WorkOrder\Tickets;
26 use App\Services\AiBlogService; 28 use App\Services\AiBlogService;
27 use App\Services\CosService; 29 use App\Services\CosService;
28 use App\Services\Geo\GeoService; 30 use App\Services\Geo\GeoService;
@@ -48,13 +50,15 @@ class lyhDemo extends Command @@ -48,13 +50,15 @@ class lyhDemo extends Command
48 protected $description = '更新路由'; 50 protected $description = '更新路由';
49 51
50 public function handle(){ 52 public function handle(){
51 -// $content = "{Introducing the cutting-edge product from Zhejiang Yuexiang Gas Technology Co., Ltd., the Bracket Gas Flowmeter. This innovative gas flowmeter is designed to provide accurate and reliable measurements for a wide range of industrial applications,Equipped with advanced technology and precision components, the Bracket Gas Flowmeter ensures exceptional performance and durability. It offers highly accurate gas flow readings, allowing users to closely monitor and control gas consumption in various processes. The meter's user-friendly interface displays real-time flow rates and totalized flow data, facilitating efficient and convenient data management,With its robust construction and corrosion-resistant materials, the Bracket Gas Flowmeter guarantees long-term reliability, even in harsh operating conditions. It is compatible with various gases such as natural gas, propane, and hydrogen, making it a versatile choice for multiple industries including oil and gas, chemical, and manufacturing,Furthermore, the Bracket Gas Flowmeter is engineered with ease of installation and maintenance in mind. Its compact and space-saving design allows for flexible mounting options, while its modular construction enables quick and hassle-free maintenance. Additionally, it meets international standards for accuracy and safety, ensuring compliance with industry regulations,Choose the Bracket Gas Flowmeter for precise and efficient gas flow measurement, backed by the expertise and commitment of Zhejiang Yuexiang Gas Technology Co., Ltd}，{Shop Quality Brackets: Top China Products & Services for Your Needs}，4K，高清 --no logo --ar 16:9";  
52 -// $midJourneyService = new MidJourneyService();  
53 -// $result = $midJourneyService->imagine($content);  
54 - $url = 'https://ecdn6-nc.globalso.com/upload/p/1/png/2025-08/688dcebc26a7a59911.png';  
55 - $cosService = new CosService();  
56 - $data = $cosService->cropAndUploadToCOS($url);  
57 - dd($data); 53 + echo 'start.'. PHP_EOL;
  54 + $ticketModel = new Tickets();
  55 + $list = $ticketModel->list(['id'=>['!=',0]],'id',['id','plan_end_at']);
  56 + foreach ($list as $item){
  57 + echo '执行数据id:'.$item['id'].PHP_EOL;
  58 + $ticketLogModel = new TicketLog();
  59 + $ticketLogModel->edit(['plan_end_at'=>$item['plan_end_at']],['ticket_id'=>$item['id']]);
  60 + }
  61 + return true;
58 } 62 }
59 63
60 /** 64 /**
  1 +<?php
  2 +/**
  3 + * @remark :
  4 + * @name :TicketCount.php
  5 + * @author :lyh
  6 + * @method :post
  7 + * @time :2025/8/7 17:42
  8 + */
  9 +
  10 +namespace App\Console\Commands\Ticket;
  11 +
  12 +use App\Models\Manage\BelongingGroup;
  13 +use App\Models\Manage\ManageHr;
  14 +use App\Models\Ticket\TicketDailyCount;
  15 +use App\Models\Ticket\TicketDailyDeptCount;
  16 +use App\Models\Ticket\TicketDailyManageCount;
  17 +use App\Models\WorkOrder\TicketLog;
  18 +use App\Models\WorkOrder\TicketProject;
  19 +use App\Models\WorkOrder\Tickets;
  20 +use Illuminate\Console\Command;
  21 +use Illuminate\Support\Carbon;
  22 +use Illuminate\Support\Facades\Log;
  23 +
  24 +class TicketCount extends Command
  25 +{
  26 + /**
  27 + * The name and signature of the console command.
  28 + *
  29 + * @var string
  30 + */
  31 + protected $signature = 'ticket_count {action}';
  32 +
  33 + /**
  34 + * The console command description.
  35 + *
  36 + * @var string
  37 + */
  38 + protected $description = '日统计工单';
  39 +
  40 + public $belong = [
  41 + 1 => [1,2,3,4,5,6,7,8,9],
  42 + 2 => [10,11,12],
  43 + ];
  44 +
  45 + /**
  46 + * @remark :统计脚本
  47 + * @name :handle
  48 + * @author :lyh
  49 + * @method :post
  50 + * @time :2025/8/7 17:45
  51 + */
  52 + public function handle(){
  53 + $action = $this->argument('action');
  54 + if($action == 'manage_action'){
  55 + $this->manage_action();
  56 + }
  57 + if($action == 'dept_action'){
  58 + $this->dept_action();
  59 + }
  60 + if($action == 'yesterday_daily_action'){
  61 + $this->yesterday_daily_action();
  62 + }
  63 + }
  64 +
  65 + /**
  66 + * @remark :按管理员统计（只统计技术组）
  67 + * @name :manage_action
  68 + * @author :lyh
  69 + * @method :post
  70 + * @time :2025/8/7 17:45
  71 + */
  72 + public function manage_action(){
  73 + $manageHrModel = new ManageHr();
  74 + $manageList = $manageHrModel->list(['status'=>1,'dept_id'=>['in',[1,2]]],'id',['id','dept_id','manage_id','name','nickname']);
  75 + $date = Carbon::yesterday()->toDateString(); // 昨日时间
  76 + $ticketManageCountModel = new TicketDailyManageCount();
  77 + foreach ($manageList as $item){
  78 + $this->output('按人员统计：执行的人员名称/id：'.$item['name'].'/'.$item['manage_id']);
  79 + $ticketLogModel = new TicketLog();
  80 + $ticket_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'is_engineer'=>1]);
  81 + //工单总时长
  82 + $timeCount = $ticketLogModel->formatQuery(['engineer_id'=>$item['manage_id'],'is_engineer'=>1])->sum('end_time');
  83 + $ticket_end_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'is_engineer'=>1,'end_at'=>['!=',null]]);
  84 + if(!empty($timeCount)){
  85 + $average_time = round($timeCount / $ticket_end_num, 2);
  86 + }
  87 + //最快完成的时间
  88 + $fastest_time = $ticketLogModel->formatQuery(['engineer_id'=>$item['manage_id'],'is_engineer'=>1,'end_at'=>['!=',null]])->min('end_time');
  89 + //超时工单数量
  90 + $timeout_num = $ticketLogModel->counts(['end_at'=>null,'engineer_id'=>$item['manage_id'],'is_engineer'=>1,'plan_end_at'=>['>',date('Y-m-d H:i:s')]]);
  91 + $complete_num = $ticketLogModel->counts(['end_at'=>['!=',null],'engineer_id'=>$item['manage_id'],'is_engineer'=>1]);
  92 + $data = [
  93 + 'date'=>$date,
  94 + 'manage_id'=>$item['id'],
  95 + 'manage_name'=>$item['name'],
  96 + 'ticket_num'=>$ticket_num,//工单总数量
  97 + 'average_time'=>$average_time ?? '',//平均完成工单时长
  98 + 'fastest_time'=>$fastest_time,//最快完成工单时间
  99 + 'timeout_num'=>$timeout_num,//超时工单数量
  100 + 'complete_num'=>$complete_num,//完成工单数量
  101 + 'dept_id'=>$item['dept_id']
  102 + ];
  103 + //查询当前用户是否当日已有记录
  104 + $ticketManageInfo = $ticketManageCountModel->read(['date'=>$date,'manage_id'=>$item['id']],['id']);
  105 + if($ticketManageInfo === false){
  106 + //TODO::执行新增
  107 + $ticketManageCountModel->addReturnId($data);
  108 + }else{
  109 + //TODO::执行编辑
  110 + $ticketManageCountModel->edit($data,['id'=>$ticketManageInfo['id']]);
  111 + }
  112 + }
  113 + return true;
  114 + }
  115 +
  116 + /**
  117 + * @remark :按技术组统计数据
  118 + * @name :dept_action
  119 + * @author :lyh
  120 + * @method :post
  121 + * @time :2025/8/8 11:48
  122 + */
  123 + public function dept_action(){
  124 + $belongingGroupModel = new BelongingGroup();
  125 + $groupList = $belongingGroupModel->list(['id'=>['in',[1,2,3,4,5,6,7,8,9]]],'id',['id','name']);
  126 + $manageHrModel = new ManageHr();
  127 + $ticketLogModel = new TicketLog();
  128 + $ticketDailyDeptModel = new TicketDailyDeptCount();
  129 + $date = Carbon::yesterday()->toDateString(); // "2025-08-07"
  130 + foreach ($groupList as $item){
  131 + $this->output('组统计：执行的组/id：'.$item['name'].'/'.$item['id']);
  132 + $manageIdArr = $manageHrModel->selectField(['belong_group'=>$item['id'],'status'=>1,'dept_id'=>1],'manage_id');
  133 + $ticket_num = $ticketLogModel->counts(['engineer_id'=>['in',$manageIdArr],'is_engineer'=>1]);
  134 + $timeCount = $ticketLogModel->formatQuery(['engineer_id'=>['in',$manageIdArr],'is_engineer'=>1])->sum('end_time');
  135 + if(!empty($timeCount)){
  136 + $average_time = round($timeCount / $ticket_num, 2);
  137 + }
  138 + $data = [
  139 + 'date'=>$date,
  140 + 'dept_id'=>$item['id'],
  141 + 'dept_name'=>$item['name'],
  142 + 'ticket_num'=>$ticket_num ?? 0,
  143 + 'average_time'=>$average_time ?? 0
  144 + ];
  145 + $deptInfo = $ticketDailyDeptModel->read(['date'=>$date,'dept_id'=>$item['id']],['id']);
  146 + if($deptInfo === false){
  147 + $ticketDailyDeptModel->addReturnId($data);
  148 + }else{
  149 + $ticketDailyDeptModel->edit($data,['id'=>$deptInfo['id']]);
  150 + }
  151 + }
  152 + return true;
  153 + }
  154 +
  155 + /**
  156 + * @remark :技术组所有工单记录
  157 + * @name :daily_action
  158 + * @author :lyh
  159 + * @method :post
  160 + * @time :2025/8/8 14:33
  161 + */
  162 + public function yesterday_daily_action(){
  163 + $ticketModel = new Tickets();
  164 + $date = Carbon::yesterday()->toDateString(); // "2025-08-07"
  165 + $ticket_num = $ticketModel->counts(['id'=>['!=',0]]);
  166 + $time_end_num = $ticketModel->counts(['end_at'=>['!=',null]]);//已完成的工单
  167 + $time_end_count = $ticketModel->formatQuery(['end_at'=>['!=',null]])->sum('end_time');//已完成工单时长
  168 + if(!empty($time_end_count)){
  169 + $average_time = round($time_end_count / $time_end_num, 2);
  170 + }
  171 + $add_num = $ticketModel->counts(['created_at'=>['between',[$date.' 00:00:00',$date.' 23:59:59']]]);
  172 + $untreated_num = $ticketModel->counts(['end_at'=>null]);
  173 + $processed_num = $ticketModel->counts(['end_at'=>['between',[$date.' 00:00:00',$date.' 23:59:59']]]);
  174 + $submit_a_side = $ticketModel->formatQuery(['submit_side'=>1])->sum('submit_side');
  175 + $submit_b_side = $ticketModel->formatQuery(['submit_side'=>2])->sum('submit_side');
  176 + $data = [
  177 + 'date' => $date,
  178 + 'ticket_num'=>$ticket_num,
  179 + 'add_num'=>$add_num,
  180 + 'untreated_num'=>$untreated_num,
  181 + 'processed_num'=>$processed_num,
  182 + 'average_time'=>$average_time ?? '',
  183 + 'source'=>json_encode(['a'=>$submit_a_side,'b'=>$submit_b_side],true),
  184 + ];
  185 + $ticketDailyModel = new TicketDailyCount();
  186 + $ticketDailyInfo = $ticketDailyModel->read(['date'=>$date],['id']);
  187 + if($ticketDailyInfo === false){
  188 + $ticketDailyModel->addReturnId($data);
  189 + }else{
  190 + $ticketDailyModel->edit($data,['id'=>$ticketDailyInfo['id']]);
  191 + }
  192 + return true;
  193 + }
  194 +
  195 + /**
  196 + * @remark :日志
  197 + * @name :output
  198 + * @author :lyh
  199 + * @method :post
  200 + * @time :2025/8/8 11:43
  201 + */
  202 + public function output($message)
  203 + {
  204 +// Log::channel('ticket_log')->info($message);
  205 + echo date('Y-m-d H:i:s') . ' ' . $message . PHP_EOL;
  206 + }
  207 +}
@@ -18,7 +18,7 @@ class FetchTicketProjects extends Command @@ -18,7 +18,7 @@ class FetchTicketProjects extends Command
18 * 18 *
19 * @var string 19 * @var string
20 */ 20 */
21 - protected $signature = 'workorder:fetch-ticket-projects {action}'; 21 + protected $signature = 'workorder:fetch-Ticket-projects {action}';
22 22
23 /** 23 /**
24 * The console command description. 24 * The console command description.
@@ -1421,3 +1421,22 @@ function getTopDomain ($url) { @@ -1421,3 +1421,22 @@ function getTopDomain ($url) {
1421 return $host; 1421 return $host;
1422 } 1422 }
1423 1423
  1424 +/**
  1425 + * @remark :两个时间的差值
  1426 + * @name :diffInHours
  1427 + * @author :lyh
  1428 + * @method :post
  1429 + * @time :2025/8/8 9:10
  1430 + */
  1431 +function diffInHours($startTime, $endTime)
  1432 +{
  1433 + $start = new DateTime($startTime);
  1434 + $end = new DateTime($endTime);
  1435 + // 计算时间差
  1436 + $interval = $start->diff($end);
  1437 + // 总小时数 = 天数 * 24 + 小时数 + 分钟数换算成小数小时
  1438 + $hours = $interval->days * 24 + $interval->h + ($interval->i / 60);
  1439 + // 四舍五入保留1位小数
  1440 + return round($hours, 1);
  1441 +}
  1442 +
@@ -143,7 +143,11 @@ class ProjectController extends BaseController @@ -143,7 +143,11 @@ class ProjectController extends BaseController
143 * @time :2023/12/29 17:14 143 * @time :2023/12/29 17:14
144 */ 144 */
145 public function orderByList($query){ 145 public function orderByList($query){
146 - $query = $query->orderBy('gl_project.uptime', 'desc')->orderBy('gl_project.id', 'desc'); 146 + if(isset($this->map['seo_plan']) && $this->map['seo_plan'] == 1){
  147 + $query = $query->orderBy('gl_project.cooperate_date', 'desc')->orderBy('gl_project.id', 'desc');
  148 + }else{
  149 + $query = $query->orderBy('gl_project.uptime', 'desc')->orderBy('gl_project.id', 'desc');
  150 + }
147 return $query; 151 return $query;
148 } 152 }
149 153
  1 +<?php
  2 +/**
  3 + * @remark :
  4 + * @name :TicketController.php
  5 + * @author :lyh
  6 + * @method :post
  7 + * @time :2025/8/11 10:46
  8 + */
  9 +
  10 +namespace App\Http\Controllers\Aside\Ticket;
  11 +
  12 +use App\Enums\Common\Code;
  13 +use App\Http\Controllers\Aside\BaseController;
  14 +use App\Http\Logic\Aside\Ticket\TicketLogic;
  15 +use Illuminate\Http\Request;
  16 +
  17 +class TicketController extends BaseController
  18 +{
  19 + public function __construct(Request $request)
  20 + {
  21 + parent::__construct($request);
  22 + $this->logic = new TicketLogic();
  23 + }
  24 +
  25 + /**
  26 + * @remark :统计记录（今日）
  27 + * @name :ticketCount
  28 + * @author :lyh
  29 + * @method :post
  30 + * @time :2025/8/11 10:47
  31 + */
  32 + public function ticketCount(){
  33 + $data['daily'] = $this->logic->getTicketCount();
  34 + $data['list'] = $this->logic->getDailyTicketCount();
  35 + $this->response('success',Code::SUCCESS,$data);
  36 + }
  37 +
  38 + /**
  39 + * @remark :技术组
  40 + * @name :manageTicketCount
  41 + * @author :lyh
  42 + * @method :post
  43 + * @time :2025/8/11 14:24
  44 + */
  45 + public function manageTicketCount(){
  46 + $this->request->validate([
  47 + 'dept_id' => 'required',
  48 + ],[
  49 + 'dept_id.required' => '技术组id',
  50 + ]);
  51 + $this->order = 'ticket_num';
  52 + $sort = $this->map['sort'] ?? 'desc';
  53 + $data = $this->logic->getManageTicketCount($this->map,$this->order,$sort);
  54 + $this->response('success',Code::SUCCESS,$data);
  55 + }
  56 +}
@@ -69,11 +69,12 @@ class AsideTicketController extends BaseController @@ -69,11 +69,12 @@ class AsideTicketController extends BaseController
69 }); 69 });
70 70
71 // 添加排序功能 71 // 添加排序功能
  72 + $query->orderBy('status', 'asc');
  73 +// $query->orderBy('id', 'desc');
72 $sortField = $request->input('sort_field', 'plan_end_at'); 74 $sortField = $request->input('sort_field', 'plan_end_at');
73 $sortOrder = strtolower($request->input('sort_order', 'asc')); 75 $sortOrder = strtolower($request->input('sort_order', 'asc'));
74 $query->orderBy($sortField, $sortOrder); 76 $query->orderBy($sortField, $sortOrder);
75 - // 添加次要排序：按状态升序排列  
76 - $query->orderBy('status', 'asc'); 77 + if ($sortField != 'plan_end_at') $query->orderBy('plan_end_at', 'asc');
77 $lists = $query->paginate($this->row, ['*'], 'page', $this->page); 78 $lists = $query->paginate($this->row, ['*'], 'page', $this->page);
78 $this->response('success', Code::SUCCESS, $lists); 79 $this->response('success', Code::SUCCESS, $lists);
79 } 80 }
@@ -239,8 +240,9 @@ class AsideTicketController extends BaseController @@ -239,8 +240,9 @@ class AsideTicketController extends BaseController
239 { 240 {
240 // 完成工单，把子任务里面未完成的工单改为完成 241 // 完成工单，把子任务里面未完成的工单改为完成
241 $ticket->end_at = now(); 242 $ticket->end_at = now();
  243 + $ticket->end_time = diffInHours($ticket->created_at,now());
242 $ticket->logs()->where('status', '<', TicketLog::STATUS_COMPLETED)->where('is_engineer', 1) 244 $ticket->logs()->where('status', '<', TicketLog::STATUS_COMPLETED)->where('is_engineer', 1)
243 - ->update(['status' => TicketLog::STATUS_COMPLETED, 'end_at' => now()]); 245 + ->update(['status' => TicketLog::STATUS_COMPLETED, 'end_at' => now(),'end_time'=>$ticket->end_time]);
244 // 推动微信通知 246 // 推动微信通知
245 $project = $ticket->project; 247 $project = $ticket->project;
246 if ($project->wechat_switch && !$ticket->close_wechat) 248 if ($project->wechat_switch && !$ticket->close_wechat)
@@ -70,6 +70,7 @@ class AsideTicketLogController extends BaseController @@ -70,6 +70,7 @@ class AsideTicketLogController extends BaseController
70 { 70 {
71 // 我的工单标记为已完成 71 // 我的工单标记为已完成
72 $log->end_at = now(); 72 $log->end_at = now();
  73 + $log->end_time = diffInHours($ticket->created_at,now());
73 } 74 }
74 } 75 }
75 if ($request->input('reply') !== null) 76 if ($request->input('reply') !== null)
@@ -91,6 +92,7 @@ class AsideTicketLogController extends BaseController @@ -91,6 +92,7 @@ class AsideTicketLogController extends BaseController
91 { 92 {
92 $ticket->status = Tickets::STATUS_COMPLETED; 93 $ticket->status = Tickets::STATUS_COMPLETED;
93 $ticket->end_at = now(); 94 $ticket->end_at = now();
  95 + $ticket->end_time = diffInHours($ticket->created_at,$ticket->end_at);
94 $project = $ticket->project; 96 $project = $ticket->project;
95 if ($project->wechat_switch && !$ticket->close_wechat) 97 if ($project->wechat_switch && !$ticket->close_wechat)
96 $project->pushWechatGroupMsg("工单（ID：{$ticket->id}）已全部完成，请访问查看详情！"); 98 $project->pushWechatGroupMsg("工单（ID：{$ticket->id}）已全部完成，请访问查看详情！");
@@ -178,7 +178,7 @@ class LoginController extends BaseController @@ -178,7 +178,7 @@ class LoginController extends BaseController
178 $wechat = new Wechat(); 178 $wechat = new Wechat();
179 $accessToken = $wechat->getAccessToken(); 179 $accessToken = $wechat->getAccessToken();
180 $data = $wechat->setQrcode('global-v6_'.$this->param['type'].'_'.$this->param['id'],$accessToken); 180 $data = $wechat->setQrcode('global-v6_'.$this->param['type'].'_'.$this->param['id'],$accessToken);
181 - if(!empty($data)){ 181 + if(!empty($data) && isset($data['ticket'])){
182 $data['url'] = "https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=".$data['ticket']; 182 $data['url'] = "https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=".$data['ticket'];
183 } 183 }
184 $this->response('success',Code::SUCCESS,$data); 184 $this->response('success',Code::SUCCESS,$data);
1 -<?php  
2 -/**  
3 - * @remark :  
4 - * @name :TestController.php  
5 - * @author :lyh  
6 - * @method :post  
7 - * @time :2024/11/5 9:44  
8 - */  
9 -  
10 -namespace App\Http\Controllers\Bside;  
11 -  
12 -use App\Enums\Common\Code;  
13 -use App\Helper\FormGlobalsoApi;  
14 -use App\Helper\PayStripeApi;  
15 -use App\Helper\Translate;  
16 -use App\Http\Logic\Bside\News\NewsLogic;  
17 -use App\Models\Ai\AiBlog;  
18 -use App\Models\Channel\Channel;  
19 -use App\Models\CustomModule\CustomModuleCategory;  
20 -use App\Models\CustomModule\CustomModuleContent;  
21 -use App\Models\CustomModule\CustomModuleExtentContent;  
22 -use App\Models\Domain\DomainInfo;  
23 -use App\Models\ExtentModule\ExtensionModuleValue;  
24 -use App\Models\HomeCount\Count;  
25 -use App\Models\Manage\ManageHr;  
26 -use App\Models\Project\CountAllProject as AllProject;  
27 -use App\Models\Project\Project;  
28 -use App\Models\Project\ProjectAiSetting;  
29 -use App\Models\RouteMap\RouteMap;  
30 -use App\Services\AiBlogService;  
31 -use App\Services\AiVideoService;  
32 -use App\Services\RapIdApIService;  
33 -use App\Services\ProjectServer;  
34 -use Illuminate\Support\Facades\DB;  
35 -  
36 -class TestController extends BaseController  
37 -{  
38 - /**  
39 - * @remark :创建项目  
40 - * @name :createProject  
41 - * @author :lyh  
42 - * @method :post  
43 - * @time :2025/2/13 16:34  
44 - */  
45 - public function ceshi(){  
46 - $hrModel = new ManageHr();  
47 - $data = $hrModel->accordIdGetLeader($this->param['id']);  
48 - $this->response('success',Code::SUCCESS,$data);  
49 - }  
50 -}  
@@ -83,7 +83,7 @@ class LoginLogic extends BaseLogic @@ -83,7 +83,7 @@ class LoginLogic extends BaseLogic
83 $manage['special'] = $this->getSpecialMenu($manage['id']); 83 $manage['special'] = $this->getSpecialMenu($manage['id']);
84 //岗位 84 //岗位
85 $manage['entry_position'] = ManageHr::where('manage_id', $manage['id'])->value('entry_position')?:0; 85 $manage['entry_position'] = ManageHr::where('manage_id', $manage['id'])->value('entry_position')?:0;
86 - Cache::add(Common::MANAGE_TOKEN . $token,$manage,3600 * 6); 86 + Cache::add(Common::MANAGE_TOKEN . $token,$manage,3600 * 12);
87 return $this->success($manage->makeVisible('token')->toArray()); 87 return $this->success($manage->makeVisible('token')->toArray());
88 } 88 }
89 89
  1 +<?php
  2 +/**
  3 + * @remark :
  4 + * @name :TicketLogic.php
  5 + * @author :lyh
  6 + * @method :post
  7 + * @time :2025/8/11 10:54
  8 + */
  9 +
  10 +namespace App\Http\Logic\Aside\Ticket;
  11 +
  12 +use App\Http\Logic\Aside\BaseLogic;
  13 +use App\Models\Ticket\TicketDailyCount;
  14 +use App\Models\Ticket\TicketDailyDeptCount;
  15 +use App\Models\Ticket\TicketDailyManageCount;
  16 +use App\Models\WorkOrder\Tickets;
  17 +use Illuminate\Support\Carbon;
  18 +
  19 +class TicketLogic extends BaseLogic
  20 +{
  21 + public function __construct()
  22 + {
  23 + parent::__construct();
  24 + $this->param = $this->requestAll;
  25 + }
  26 +
  27 + /**
  28 + * @remark :获取今日统计数据
  29 + * @name :getTicketCount
  30 + * @author :lyh
  31 + * @method :post
  32 + * @time :2025/8/11 10:54
  33 + */
  34 + public function getTicketCount(){
  35 + $data = [];
  36 + $ticketModel = new Tickets();
  37 + $data['ticket_num'] = $ticketModel->count();//工单总数
  38 + $date = date('Y-m-d');//今日时间
  39 + $data['add_num'] = $ticketModel->counts(['created_at'=>['between',[$date.' 00:00:00',$date.' 23:59:59']]]);//今日新增工单
  40 + $data['processed_num'] = $ticketModel->counts(['end_at'=>['between',[$date.' 00:00:00',$date.' 23:59:59']]]);//今日已处理工单
  41 + $data['untreated_num'] = $ticketModel->counts(['end_at'=>null]);//今日未处理工单
  42 + return $this->success($data);
  43 + }
  44 +
  45 + /**
  46 + * @remark :按日统计数据
  47 + * @name :getDailyTicketCount
  48 + * @author :lyh
  49 + * @method :post
  50 + * @time :2025/8/11 10:57
  51 + */
  52 + public function getDailyTicketCount(){
  53 + $date = Carbon::yesterday()->toDateString(); //昨日时间
  54 + $dailyModel = new TicketDailyCount();
  55 + $dailyList = $dailyModel->list(['date'=>$date],'average_time',['*'],'desc',5);//取最近5条数据
  56 + $manageModel = new TicketDailyManageCount();
  57 + $manageList = $manageModel->list(['date'=>$date],'average_time',['*'],'desc',5);//取最近5条数据
  58 + $deptModel = new TicketDailyDeptCount();
  59 + $deptList = $deptModel->list(['date'=>$date],'average_time',['*'],'desc',5);
  60 + $data = ['daily'=>$dailyList,'manage'=>$manageList,'dept'=>$deptList];
  61 + return $this->success($data);
  62 + }
  63 +
  64 + /**
  65 + * @remark :根据技术组获取
  66 + * @name :getManageTicketCount
  67 + * @author :lyh
  68 + * @method :post
  69 + * @time :2025/8/11 14:41
  70 + */
  71 + public function getManageTicketCount($map,$order = 'ticket_num',$desc = 'desc'){
  72 + $manageModel = new TicketDailyManageCount();
  73 + unset($map['sort']);
  74 + $map['date'] = Carbon::yesterday()->toDateString();
  75 + $manageList = $manageModel->list($map,$order,['*'],$desc);
  76 + return $this->success($manageList);
  77 + }
  78 +
  79 +}
@@ -51,7 +51,11 @@ class TranslateLogic extends BaseLogic @@ -51,7 +51,11 @@ class TranslateLogic extends BaseLogic
51 return $this->success($data); 51 return $this->success($data);
52 } 52 }
53 // 需要校对路由 53 // 需要校对路由
54 - $url = $this->user['domain'] . (($this->param['url'] != '/') ? $this->param['url'] : ''); 54 + if($this->user['project_id'] == 3778){
  55 + $url = $this->user['test_domain'] . (($this->param['url'] != '/') ? $this->param['url'] : '');
  56 + }else{
  57 + $url = $this->user['domain'] . (($this->param['url'] != '/') ? $this->param['url'] : '');
  58 + }
55 // 需要校对语种 59 // 需要校对语种
56 $languageInfo = $this->getLanguage($this->param['language_id']); 60 $languageInfo = $this->getLanguage($this->param['language_id']);
57 // 原始校对内容 61 // 原始校对内容
@@ -139,7 +143,11 @@ class TranslateLogic extends BaseLogic @@ -139,7 +143,11 @@ class TranslateLogic extends BaseLogic
139 } 143 }
140 return $this->success($data); 144 return $this->success($data);
141 } 145 }
142 - $url = $this->user['domain'].(($this->param['url'] != '/') ? $this->param['url'] : ''); 146 + if($this->user['project_id'] == 3778){
  147 + $url = $this->user['test_domain'] . (($this->param['url'] != '/') ? $this->param['url'] : '');
  148 + }else{
  149 + $url = $this->user['domain'] . (($this->param['url'] != '/') ? $this->param['url'] : '');
  150 + }
143 $param = $this->getRouteSource($this->param['url']); 151 $param = $this->getRouteSource($this->param['url']);
144 $param['language_id'] = $this->param['language_id']; 152 $param['language_id'] = $this->param['language_id'];
145 $param['type'] = $this->param['type']; 153 $param['type'] = $this->param['type'];
  1 +<?php
  2 +/**
  3 + * @remark :
  4 + * @name :TicketDailyCount.php
  5 + * @author :lyh
  6 + * @method :post
  7 + * @time :2025/8/7 17:50
  8 + */
  9 +
  10 +namespace App\Models\Ticket;
  11 +
  12 +use App\Models\Base;
  13 +
  14 +/**
  15 + * @remark :工单日统计
  16 + * @name :TicketDailyCount
  17 + * @author :lyh
  18 + * @method :post
  19 + * @time :2025/8/7 17:51
  20 + */
  21 +class TicketDailyCount extends Base
  22 +{
  23 + protected $table = 'gl_ticket_daily_count';
  24 +}
  1 +<?php
  2 +/**
  3 + * @remark :
  4 + * @name :TicketDailyDeptCount.php
  5 + * @author :lyh
  6 + * @method :post
  7 + * @time :2025/8/7 17:51
  8 + */
  9 +
  10 +namespace App\Models\Ticket;
  11 +
  12 +use App\Models\Base;
  13 +
  14 +/**
  15 + * @remark :工单日统计：按照技术组统计
  16 + * @name :TicketDailyDeptCount
  17 + * @author :lyh
  18 + * @method :post
  19 + * @time :2025/8/7 17:51
  20 + */
  21 +class TicketDailyDeptCount extends Base
  22 +{
  23 + protected $table = 'gl_ticket_daily_dept_count';
  24 +}
  1 +<?php
  2 +/**
  3 + * @remark :
  4 + * @name :TicketDailyManageCount.php
  5 + * @author :lyh
  6 + * @method :post
  7 + * @time :2025/8/7 17:52
  8 + */
  9 +
  10 +namespace App\Models\Ticket;
  11 +
  12 +use App\Models\Base;
  13 +
  14 +/**
  15 + * @remark :工单日统计：按照人员统计
  16 + * @name :TicketDailyManageCount
  17 + * @author :lyh
  18 + * @method :post
  19 + * @time :2025/8/7 17:53
  20 + */
  21 +class TicketDailyManageCount extends Base
  22 +{
  23 + protected $table = 'gl_ticket_daily_manage_count';
  24 +}
@@ -84,6 +84,7 @@ class Tickets extends Base @@ -84,6 +84,7 @@ class Tickets extends Base
84 if ($log && $log->is_engineer != in_array($engineer_id, $engineer_ids)) 84 if ($log && $log->is_engineer != in_array($engineer_id, $engineer_ids))
85 { 85 {
86 $log->is_engineer = in_array($engineer_id, $engineer_ids); 86 $log->is_engineer = in_array($engineer_id, $engineer_ids);
  87 + $log->plan_end_at = $this->plan_end_at; // 新增时写入 plan_end_at
87 $log->save(); 88 $log->save();
88 }else 89 }else
89 { 90 {
@@ -91,6 +92,7 @@ class Tickets extends Base @@ -91,6 +92,7 @@ class Tickets extends Base
91 $log = new TicketLog(); 92 $log = new TicketLog();
92 $log->engineer_id = $engineer_id; 93 $log->engineer_id = $engineer_id;
93 $log->is_engineer = in_array($engineer_id, $engineer_ids); 94 $log->is_engineer = in_array($engineer_id, $engineer_ids);
  95 + $log->plan_end_at = $this->plan_end_at; // 新增时写入 plan_end_at
94 $this->logs()->save($log); 96 $this->logs()->save($log);
95 } 97 }
96 }catch (\Exception $exception){ 98 }catch (\Exception $exception){
@@ -27,7 +27,7 @@ class MessagePush extends Base @@ -27,7 +27,7 @@ class MessagePush extends Base
27 27
28 const TYPE_INQUIRY = 'inquiry'; 28 const TYPE_INQUIRY = 'inquiry';
29 const TYPE_WEEK = 'week'; 29 const TYPE_WEEK = 'week';
30 - const TYPE_TICKET = 'ticket'; 30 + const TYPE_TICKET = 'Ticket';
31 //设置关联表名 31 //设置关联表名
32 /** 32 /**
33 * @var mixed 33 * @var mixed
@@ -632,7 +632,11 @@ Route::middleware(['aloginauth'])->group(function () { @@ -632,7 +632,11 @@ Route::middleware(['aloginauth'])->group(function () {
632 // 流量统计 632 // 流量统计
633 Route::any('/flow', [Aside\Project\StatisticsController::class, 'flow'])->name('admin.statistics_flow'); 633 Route::any('/flow', [Aside\Project\StatisticsController::class, 'flow'])->name('admin.statistics_flow');
634 }); 634 });
635 - 635 + //ticket
  636 + Route::prefix('ticket_count')->group(function () {
  637 + Route::any('/ticketCount', [\App\Http\Controllers\Aside\Ticket\TicketController::class,'ticketCount'])->name('ticket_count_ticketCount');
  638 + Route::any('/manageTicketCount', [\App\Http\Controllers\Aside\Ticket\TicketController::class,'manageTicketCount'])->name('ticket_count_manageTicketCount');
  639 + });
636 }); 640 });
637 641
638 //无需登录验证的路由组 642 //无需登录验证的路由组