damon/links
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

手动关闭状态不要自动打开重启同步

Browse Source
This commit is contained in:
root
2026-07-07 14:56:39 +08:00
parent 2e621bf970
commit 92b4faf61f
12 changed files with 166 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/admin/command/Install/split_ticket.sql
+1
View File
@@ -20,6 +20,7 @@ CREATE TABLE `fa_split_ticket` (
`account` varchar(50) NOT NULL DEFAULT '' COMMENT '工单账号',
`password` varchar(50) NOT NULL DEFAULT '' COMMENT '工单密码',
`status` enum('normal','hidden') NOT NULL DEFAULT 'normal' COMMENT '状态:normal=正常,hidden=停用',
`manual_manage` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '手动管理:0=否,1=是(手动关闭后暂停同步且禁止自动开启)',
`complete_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '完成数量(同步)',
`inbound_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '进线人数(同步)',
`speed_per_hour` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '当前速度:每小时进线(同步)',
application/admin/command/Install/split_ticket_manual_manage.sql
+6
View File
@@ -0,0 +1,6 @@
-- 工单手动管理：手动关闭后禁止自动同步与自动开启
SET NAMES utf8mb4;
ALTER TABLE `fa_split_ticket`
ADD COLUMN `manual_manage` tinyint(1) unsigned NOT NULL DEFAULT 0
COMMENT '手动管理:0=否,1=是(手动关闭后暂停同步且禁止自动开启)' AFTER `status`;
application/admin/controller/split/Ticket.php
+16 -1
View File
@@ -279,11 +279,22 @@ class Ticket extends Backend
$params['sync_fail_count'],
$params['speed_snapshot_count'],
$params['speed_snapshot_time'],
$params['click_count']
$params['click_count'],
$params['manual_manage']
);
return $params;
}
/**
* 用户切换工单状态时写入 manual_manage，防止同步自动恢复开启
*
* @param array<string, mixed> $values
*/
private function applyManualManageForStatusChange(array &$values): void
{
(new SplitTicketRuleService())->applyManualManageForStatusChange($values);
}
/**
* 手动同步选中工单（投递 CLI 后台执行，Web 请求立即返回）
*/
@@ -408,6 +419,7 @@ class Ticket extends Backend
$ruleService = new SplitTicketRuleService();
if (isset($values['status'])) {
$this->applyManualManageForStatusChange($values);
$pk = $this->model->getPk();
$adminIds = $this->getDataLimitAdminIds();
$query = $this->model->where($pk, 'in', $ids);
@@ -582,6 +594,9 @@ class Ticket extends Backend
$params['number_type_custom'] = '';
}
$oldStatus = (string) ($row['status'] ?? 'hidden');
if (isset($params['status']) && (string) $params['status'] !== $oldStatus) {
$this->applyManualManageForStatusChange($params);
}
$result = false;
Db::startTrans();
try {
application/common/service/SplitTicketRuleService.php
+29 -1
View File
@@ -19,6 +19,31 @@ class SplitTicketRuleService
$this->ratioDeferredService = $ratioDeferredService ?? new SplitNumberRatioDeferredService();
}
/**
* 手动关闭的工单（manual_manage=1）：禁止自动同步改写 status，须用户手动开启
*/
public function isManuallyClosed(Ticket $ticket): bool
{
return (int) ($ticket['manual_manage'] ?? 0) === 1;
}
/**
* 列表/编辑切换状态时同步 manual_manage 标记
*
* @param array<string, mixed> $values
*/
public function applyManualManageForStatusChange(array &$values): void
{
if (!isset($values['status'])) {
return;
}
if ((string) $values['status'] === 'hidden') {
$values['manual_manage'] = 1;
} elseif ((string) $values['status'] === 'normal') {
$values['manual_manage'] = 0;
}
}
/**
* 同步后应用工单开关规则；号码开关由 applyNumberRules 综合裁决（平台在线 + 单号上限 + 下号比率）
*/
@@ -190,10 +215,13 @@ class SplitTicketRuleService
}
/**
* 完成量、时间窗口决定工单开关（定时与手动同步均适用）
* 完成量、时间窗口决定工单开关（定时与手动同步均适用；手动关闭工单除外）
*/
public function applyTicketStatusRules(Ticket $ticket, int $completeCount): void
{
if ($this->isManuallyClosed($ticket)) {
return;
}
$status = $this->resolveTicketStatus($ticket, $completeCount);
if ($status !== (string) ($ticket['status'] ?? 'hidden')) {
Ticket::where('id', (int) $ticket['id'])->update([
application/common/service/SplitTicketSyncDispatchService.php
+9 -4
View File
@@ -38,6 +38,10 @@ class SplitTicketSyncDispatchService
foreach ($metaList as $meta) {
$ticketId = (int) $meta['id'];
if ((int) ($meta['manual_manage'] ?? 0) === 1) {
$skipped[] = $ticketId;
continue;
}
if ($lockService->isLocked($ticketId)) {
$skipped[] = $ticketId;
continue;
@@ -326,15 +330,16 @@ class SplitTicketSyncDispatchService
$rows = Db::name('split_ticket')
->where('id', 'in', $ids)
->field('id,ticket_type,ticket_url')
->field('id,ticket_type,ticket_url,manual_manage')
->select();
$list = [];
foreach ($rows as $row) {
$list[] = [
'id' => (int) $row['id'],
'ticket_type' => (string) ($row['ticket_type'] ?? ''),
'ticket_url' => (string) ($row['ticket_url'] ?? ''),
'id' => (int) $row['id'],
'ticket_type' => (string) ($row['ticket_type'] ?? ''),
'ticket_url' => (string) ($row['ticket_url'] ?? ''),
'manual_manage' => (int) ($row['manual_manage'] ?? 0),
];
}
application/common/service/SplitTicketSyncService.php
+22 -1
View File
@@ -51,12 +51,19 @@ class SplitTicketSyncService
'force' => $force,
'syncMode' => $syncMode,
'status' => (string) $ticket['status'],
'manualManage' => (int) ($ticket['manual_manage'] ?? 0),
'syncFailCount' => (int) ($ticket['sync_fail_count'] ?? 0),
'syncTime' => (int) ($ticket['sync_time'] ?? 0),
'pageUrl' => (string) $ticket['ticket_url'],
'nodeHost' => SplitSyncConfigService::getNodeHost(),
]);
if ($this->ruleService->isManuallyClosed($ticket)) {
SplitTicketSyncLogger::log('sync', 'skipped', ['reason' => '工单已手动关闭']);
SplitTicketSyncLogger::clearTicketContext();
return ['success' => false, 'message' => '工单已手动关闭，暂停同步', 'skipped' => true];
}
if (!$force && !$dueValidated) {
$skip = $this->shouldSkip($ticket);
if ($skip !== null) {
@@ -389,7 +396,9 @@ class SplitTicketSyncService
return [];
}
$query = Ticket::where('status', 'normal')->whereIn('ticket_type', $types);
$query = Ticket::where('status', 'normal')
->where('manual_manage', 0)
->whereIn('ticket_type', $types);
if ($failThreshold > 0) {
$query->where('sync_fail_count', '<', $failThreshold);
}
@@ -503,6 +512,15 @@ class SplitTicketSyncService
*/
private function doSync(Ticket $ticket, string $syncMode): array
{
$freshTicket = Ticket::get((int) $ticket['id']);
if (!$freshTicket) {
return ['success' => false, 'message' => '工单不存在', 'skipped' => true];
}
if ($this->ruleService->isManuallyClosed($freshTicket)) {
return ['success' => false, 'message' => '工单已手动关闭，暂停同步', 'skipped' => true];
}
$ticket = $freshTicket;
$ticketType = (string) $ticket['ticket_type'];
$pageUrl = trim((string) $ticket['ticket_url']);
if ($pageUrl === '') {
@@ -589,6 +607,9 @@ class SplitTicketSyncService
private function shouldSkip(Ticket $ticket): ?string
{
if ($this->ruleService->isManuallyClosed($ticket)) {
return '工单已手动关闭，暂停同步';
}
if ((string) $ticket['status'] === 'hidden') {
return '工单已关闭';
}
patches/application/admin/command/Install/split_ticket.sql
+1
View File
@@ -20,6 +20,7 @@ CREATE TABLE `fa_split_ticket` (
`account` varchar(50) NOT NULL DEFAULT '' COMMENT '工单账号',
`password` varchar(50) NOT NULL DEFAULT '' COMMENT '工单密码',
`status` enum('normal','hidden') NOT NULL DEFAULT 'normal' COMMENT '状态:normal=正常,hidden=停用',
`manual_manage` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '手动管理:0=否,1=是(手动关闭后暂停同步且禁止自动开启)',
`complete_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '完成数量(同步)',
`inbound_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '进线人数(同步)',
`speed_per_hour` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '当前速度:每小时进线(同步)',
patches/application/admin/command/Install/split_ticket_manual_manage.sql
+6
View File
@@ -0,0 +1,6 @@
-- 工单手动管理：手动关闭后禁止自动同步与自动开启
SET NAMES utf8mb4;
ALTER TABLE `fa_split_ticket`
ADD COLUMN `manual_manage` tinyint(1) unsigned NOT NULL DEFAULT 0
COMMENT '手动管理:0=否,1=是(手动关闭后暂停同步且禁止自动开启)' AFTER `status`;
patches/application/admin/controller/split/Ticket.php
+16 -1
View File
@@ -279,11 +279,22 @@ class Ticket extends Backend
$params['sync_fail_count'],
$params['speed_snapshot_count'],
$params['speed_snapshot_time'],
$params['click_count']
$params['click_count'],
$params['manual_manage']
);
return $params;
}
/**
* 用户切换工单状态时写入 manual_manage，防止同步自动恢复开启
*
* @param array<string, mixed> $values
*/
private function applyManualManageForStatusChange(array &$values): void
{
(new SplitTicketRuleService())->applyManualManageForStatusChange($values);
}
/**
* 手动同步选中工单（投递 CLI 后台执行，Web 请求立即返回）
*/
@@ -408,6 +419,7 @@ class Ticket extends Backend
$ruleService = new SplitTicketRuleService();
if (isset($values['status'])) {
$this->applyManualManageForStatusChange($values);
$pk = $this->model->getPk();
$adminIds = $this->getDataLimitAdminIds();
$query = $this->model->where($pk, 'in', $ids);
@@ -582,6 +594,9 @@ class Ticket extends Backend
$params['number_type_custom'] = '';
}
$oldStatus = (string) ($row['status'] ?? 'hidden');
if (isset($params['status']) && (string) $params['status'] !== $oldStatus) {
$this->applyManualManageForStatusChange($params);
}
$result = false;
Db::startTrans();
try {
patches/application/common/service/SplitTicketRuleService.php
+29 -1
View File
@@ -19,6 +19,31 @@ class SplitTicketRuleService
$this->ratioDeferredService = $ratioDeferredService ?? new SplitNumberRatioDeferredService();
}
/**
* 手动关闭的工单（manual_manage=1）：禁止自动同步改写 status，须用户手动开启
*/
public function isManuallyClosed(Ticket $ticket): bool
{
return (int) ($ticket['manual_manage'] ?? 0) === 1;
}
/**
* 列表/编辑切换状态时同步 manual_manage 标记
*
* @param array<string, mixed> $values
*/
public function applyManualManageForStatusChange(array &$values): void
{
if (!isset($values['status'])) {
return;
}
if ((string) $values['status'] === 'hidden') {
$values['manual_manage'] = 1;
} elseif ((string) $values['status'] === 'normal') {
$values['manual_manage'] = 0;
}
}
/**
* 同步后应用工单开关规则；号码开关由 applyNumberRules 综合裁决（平台在线 + 单号上限 + 下号比率）
*/
@@ -190,10 +215,13 @@ class SplitTicketRuleService
}
/**
* 完成量、时间窗口决定工单开关（定时与手动同步均适用）
* 完成量、时间窗口决定工单开关（定时与手动同步均适用；手动关闭工单除外）
*/
public function applyTicketStatusRules(Ticket $ticket, int $completeCount): void
{
if ($this->isManuallyClosed($ticket)) {
return;
}
$status = $this->resolveTicketStatus($ticket, $completeCount);
if ($status !== (string) ($ticket['status'] ?? 'hidden')) {
Ticket::where('id', (int) $ticket['id'])->update([
patches/application/common/service/SplitTicketSyncDispatchService.php
+9 -4
View File
@@ -38,6 +38,10 @@ class SplitTicketSyncDispatchService
foreach ($metaList as $meta) {
$ticketId = (int) $meta['id'];
if ((int) ($meta['manual_manage'] ?? 0) === 1) {
$skipped[] = $ticketId;
continue;
}
if ($lockService->isLocked($ticketId)) {
$skipped[] = $ticketId;
continue;
@@ -326,15 +330,16 @@ class SplitTicketSyncDispatchService
$rows = Db::name('split_ticket')
->where('id', 'in', $ids)
->field('id,ticket_type,ticket_url')
->field('id,ticket_type,ticket_url,manual_manage')
->select();
$list = [];
foreach ($rows as $row) {
$list[] = [
'id' => (int) $row['id'],
'ticket_type' => (string) ($row['ticket_type'] ?? ''),
'ticket_url' => (string) ($row['ticket_url'] ?? ''),
'id' => (int) $row['id'],
'ticket_type' => (string) ($row['ticket_type'] ?? ''),
'ticket_url' => (string) ($row['ticket_url'] ?? ''),
'manual_manage' => (int) ($row['manual_manage'] ?? 0),
];
}
patches/application/common/service/SplitTicketSyncService.php
+22 -1
View File
@@ -51,12 +51,19 @@ class SplitTicketSyncService
'force' => $force,
'syncMode' => $syncMode,
'status' => (string) $ticket['status'],
'manualManage' => (int) ($ticket['manual_manage'] ?? 0),
'syncFailCount' => (int) ($ticket['sync_fail_count'] ?? 0),
'syncTime' => (int) ($ticket['sync_time'] ?? 0),
'pageUrl' => (string) $ticket['ticket_url'],
'nodeHost' => SplitSyncConfigService::getNodeHost(),
]);
if ($this->ruleService->isManuallyClosed($ticket)) {
SplitTicketSyncLogger::log('sync', 'skipped', ['reason' => '工单已手动关闭']);
SplitTicketSyncLogger::clearTicketContext();
return ['success' => false, 'message' => '工单已手动关闭，暂停同步', 'skipped' => true];
}
if (!$force && !$dueValidated) {
$skip = $this->shouldSkip($ticket);
if ($skip !== null) {
@@ -389,7 +396,9 @@ class SplitTicketSyncService
return [];
}
$query = Ticket::where('status', 'normal')->whereIn('ticket_type', $types);
$query = Ticket::where('status', 'normal')
->where('manual_manage', 0)
->whereIn('ticket_type', $types);
if ($failThreshold > 0) {
$query->where('sync_fail_count', '<', $failThreshold);
}
@@ -503,6 +512,15 @@ class SplitTicketSyncService
*/
private function doSync(Ticket $ticket, string $syncMode): array
{
$freshTicket = Ticket::get((int) $ticket['id']);
if (!$freshTicket) {
return ['success' => false, 'message' => '工单不存在', 'skipped' => true];
}
if ($this->ruleService->isManuallyClosed($freshTicket)) {
return ['success' => false, 'message' => '工单已手动关闭，暂停同步', 'skipped' => true];
}
$ticket = $freshTicket;
$ticketType = (string) $ticket['ticket_type'];
$pageUrl = trim((string) $ticket['ticket_url']);
if ($pageUrl === '') {
@@ -589,6 +607,9 @@ class SplitTicketSyncService
private function shouldSkip(Ticket $ticket): ?string
{
if ($this->ruleService->isManuallyClosed($ticket)) {
return '工单已手动关闭，暂停同步';
}
if ((string) $ticket['status'] === 'hidden') {
return '工单已关闭';
}