周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 e539c2bf428f80403a210440fa4c7be82b8acc1a 2 个父辈 663c0fc6 49281583

Merge remote-tracking branch 'origin/master' into akun

内嵌 并排对比
正在显示 9 个修改的文件 包含 47 行增加 和 23 行删除
... ... @@ -63,7 +63,7 @@ class AiVideoAutoPublish extends Command
}
/**
* @remark :普通项目--自动发布
* @remark :自动发布aiVideo组装数据（写入一条记录）
* @name :auto_six_publish
* @author :lyh
* @method :post
... ... @@ -73,7 +73,7 @@ class AiVideoAutoPublish extends Command
$this->output('开始自动发布Video文章');
$projectModel = new Project();
$optimizeModel = new DeployOptimize();
$projectList = $projectModel->list(['is_ai_video'=>1,'id'=>1,'delete_status'=>0,'site_status'=>0,'extend_type'=>0],'id',['id','project_type']);
$projectList = $projectModel->list(['is_ai_video'=>1,'delete_status'=>0,'site_status'=>0,'extend_type'=>0],'id',['id','project_type']);
foreach ($projectList as $item){
$this->output("项目{$item['id']}开始自动发布");
//获取当前是否开启自动发布aiVideo
... ... @@ -129,10 +129,7 @@ class AiVideoAutoPublish extends Command
return $data;
}
$data['title'] = $info['title'];
$data['remark'] = strip_tags($info['intro']);
if(empty($data['remark'])){
$data['remark'] = $data['title'];
}
$data['remark'] = $info['intro'];
$data['images'] = array_filter(array_map(function ($item) use ($data) {
if (!empty($item['url'])) {
return [
... ... @@ -193,7 +190,6 @@ class AiVideoAutoPublish extends Command
}
$item = $aiVideoAutoLogModel->read(['status'=>0,'trigger_id'=>null]);
if($item === false){
echo date('Y-m-d H:i:s').':无生成图片的数据。'.PHP_EOL;
sleep(60);
continue;
}
... ... @@ -204,7 +200,7 @@ class AiVideoAutoPublish extends Command
$midJourneyService = new MidJourneyService();
$result = $midJourneyService->imagine($content);
if($result && !empty($result['trigger_id'])){
echo '提交的数据详情。'.json_encode($result,true).$item['project_id'].PHP_EOL;
echo '提交的数据详情。'.json_encode($result, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES).$item['project_id'].PHP_EOL;
Redis::incr('ai_video_image');
$aiVideoAutoLogModel->edit(['trigger_id'=>$result['trigger_id']],['id'=>$item['id']]);
}
... ... @@ -241,14 +237,17 @@ class AiVideoAutoPublish extends Command
$aiVideoService = new AiVideoService($info['project_id']);
$projectModel = new DeployOptimize();
$video_setting = $projectModel->getValue(['project_id'=>$info['project_id']],'video_setting');
$frequency_setting = $projectModel->getValue(['project_id'=>$info['project_id']],'send_ai_video_frequency');
$storage = $aiVideoTaskModel->videoSetting()[$video_setting ?? 1];
$frequency = $aiVideoTaskModel->videoFrequency()[$frequency_setting ?? 1];
$frequencyArr = explode('-',$frequency);
$result = $aiVideoService->createTask($info['title'],$info['remark'],$info['images'],[],$storage);
if($result['status'] == 200){
$aiVideoTaskModel->addReturnId(['task_id'=>$result['data']['task_id'],'project_id'=>$info['project_id'],'storage'=>$storage]);
$next_auto_date = date('Y-m-d', strtotime('+' . mt_rand($frequencyArr[0] ?? 5,$frequencyArr[1] ?? 7) . 'days')); //每5-7天自动发布
$aiVideoTaskModel->addReturnId(['next_auto_date'=>$next_auto_date,'task_id'=>$result['data']['task_id'],'project_id'=>$info['project_id'],'storage'=>$storage]);
ProjectServer::useProject($info['project_id']);
$aiVideoModel = new AiVideo();
$next_auto_date = date('Y-m-d', strtotime('+' . mt_rand(5,7) . 'days')); //每5-7天自动发布
$aiVideoModel->addReturnId(['next_auto_date'=>$next_auto_date,'title'=>$info['title'],'task_id'=>$result['data']['task_id'],'description'=>$info['remark'],'project_id'=>$info['project_id'],'images'=>json_encode($info['images'],true),'anchor'=>json_encode([],true)]);
$aiVideoModel->addReturnId(['title'=>$info['title'],'task_id'=>$result['data']['task_id'],'description'=>$info['remark'],'project_id'=>$info['project_id'],'images'=>json_encode($info['images'],true),'anchor'=>json_encode([],true)]);
DB::disconnect('custom_mysql');
$aiVideoAutoLogModel->edit(['status'=>2],['id'=>$info['id']]);
}
... ... @@ -289,7 +288,7 @@ class AiVideoAutoPublish extends Command
* @method :post
* @time :2025/8/1 16:25
*/
public function getAiVideoParam($project_id = 3751)
public function getAiVideoParam($project_id)
{
//获取当前网站域名
$domainModel = new DomainInfo();
... ...
... ... @@ -1297,7 +1297,8 @@ class ProjectController extends BaseController
*/
public function videoSetting(){
$videoModel = new AiVideoTask();
$data = $videoModel->videoSetting();
$data['videoSetting'] = $videoModel->videoSetting();
$data['videoFrequency'] =$videoModel->videoFrequency();
$this->response('success',Code::SUCCESS,$data);
}
}
... ...
... ... @@ -25,7 +25,7 @@ class AsideTicketController extends BaseController
public function index(AsideTicketListRequest $request)
{
$validated = $request->validated();
$lists = Tickets::with([
$query = Tickets::with([
'logs.engineer',
'project.pm',
'project.projectV6',
... ... @@ -66,9 +66,15 @@ class AsideTicketController extends BaseController
->orWhere('company_name', 'like', '%' . $search . '%');
});
});
})
->orderBy('id', 'desc')
->paginate($this->row, ['*'], 'page', $this->page);
});
// 添加排序功能
$sortField = $request->input('sort_field', 'plan_end_at');
$sortOrder = strtolower($request->input('sort_order', 'asc'));
$query->orderBy($sortField, $sortOrder);
// 添加次要排序：按状态升序排列
$query->orderBy('status', 'asc');
$lists = $query->paginate($this->row, ['*'], 'page', $this->page);
$this->response('success', Code::SUCCESS, $lists);
}
... ...
... ... @@ -95,6 +95,8 @@ class AsideTicketLogController extends BaseController
if ($project->wechat_switch && !$ticket->close_wechat)
$project->pushWechatGroupMsg("工单（ID：{$ticket->id}）已全部完成，请访问查看详情！");
$ticket->pushDing('finish');
}else{
$ticket->status = Tickets::STATUS_YANSHOU;
}
}
$ticket->save();
... ...
... ... @@ -24,7 +24,7 @@ class TicketListRequest extends FormRequest
public function rules()
{
return [
'status' => 'nullable|in:0,1,2,3|integer',
'status' => 'nullable|in:0,1,2,3,9|integer',
'search' => 'nullable|string', // 搜索关键词
'page' => 'nullable|integer',
'size' => 'nullable|integer',
... ...
... ... @@ -25,12 +25,14 @@ class AsideTicketListRequest extends FormRequest
{
return [
'project_id' => 'nullable|string',
'status' => 'nullable|in:0,1,2,3|integer',
'status' => 'nullable|in:0,1,2,3,9|integer',
'star' => 'nullable|in:1,2,3|integer',
'search' => 'nullable|string', // 搜索关键词
'engineer_id' => 'nullable|integer', // 工程师ID
'page' => 'nullable|integer',
'size' => 'nullable|integer',
'sort_field' => 'nullable|in:created_at,plan_end_at',
'sort_order' => 'nullable|in:asc,desc',
];
}
}
... ...
... ... @@ -27,7 +27,7 @@ class AsideTicketUpdateRequest extends FormRequest
'title' => 'nullable|string',
'content' => 'nullable|string',
'files' => 'nullable|array',
'status' => 'nullable|in:0,1,2,3|integer',
'status' => 'nullable|in:0,1,2,3,9|integer',
'engineer_ids' => 'nullable|array',
'star' => 'nullable|in:1,2,3|integer',
'plan_end_at' => 'nullable|date',
... ...
... ... @@ -22,7 +22,7 @@ class AiVideoTask extends Base
const STATUS_FINISH = 2;
/**
* @remark :视频设置
* @remark :配置
* @name :videoSetting
* @author :lyh
* @method :post
... ... @@ -34,4 +34,17 @@ class AiVideoTask extends Base
2 => 'YOUTUBE'
];
}
/**
* @remark :配置
* @name :videoFrequency
* @author :lyh
* @method :post
* @time :2025/8/1 17:17
*/
public function videoFrequency(){
return [
1 => '5-7',
];
}
}
... ...
... ... @@ -15,8 +15,9 @@ class Tickets extends Base
const STATUS_PEDDING = 0; // 待处理
const STATUS_PROCESSING = 1; // 处理中
const STATUS_COMPLETED = 2; // 已完成
const STATUS_CLOSED = 3; // 已关闭，已失效
const STATUS_YANSHOU = 2; // 验收中
const STATUS_COMPLETED = 3; // 已完成
const STATUS_CLOSED = 9; // 已关闭，已失效，审核不通过，结束工单设置大一点，方便中途又要加状态
/**
* @return void
... ...