gdxz/hospital-applets-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改表明

Browse Source
This commit is contained in:
wucongxing8150 2024-03-12 16:41:10 +08:00
parent f7bc5f70b3
commit 6626cfe2fd
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Amqp/Consumer/SendVideoNoticeDelayDirectConsumer.php
View File

@ -113,8 +113,8 @@ class SendVideoNoticeDelayDirectConsumer extends ConsumerMessage
// 检测是否已开过视频 // 检测是否已开过视频
$params = array(); $params = array();
$params['order_inquiry_id'] = $order_inquiry_video_reservation['order_inquiry_id']; $params['order_inquiry_id'] = $order_inquiry_video_reservation['order_inquiry_id'];
$order_inquiry_video_records = OrderInquiryVideoRecord::getOne($params); $order_inquiry_video_record = OrderInquiryVideoRecord::getOne($params);
if (!empty($order_inquiry_video_records)) { if (!empty($order_inquiry_video_record)) {
Log::getInstance("queue-SendVideoNotice")->info("已开过视频,无需发送" ); Log::getInstance("queue-SendVideoNotice")->info("已开过视频,无需发送" );
return Result::ACK; return Result::ACK;
} }

24
app/Controller/CallBackController.php
View File

@ -1784,8 +1784,8 @@ class CallBackController extends AbstractController
$params = array(); $params = array();
$params['room_id'] = $request_params['EventInfo']['RoomId']; $params['room_id'] = $request_params['EventInfo']['RoomId'];
$params['order_inquiry_id'] = $order_inquiry_video_reservation['order_inquiry_id']; $params['order_inquiry_id'] = $order_inquiry_video_reservation['order_inquiry_id'];
$order_inquiry_video_records = OrderInquiryVideoRecord::getLastOne($params); $order_inquiry_video_record = OrderInquiryVideoRecord::getLastOne($params);
if (empty($order_inquiry_video_records)){ if (empty($order_inquiry_video_record)){
return $this->TrtcErrorReturn("缺少视频开启记录"); return $this->TrtcErrorReturn("缺少视频开启记录");
} }
@ -1855,14 +1855,14 @@ class CallBackController extends AbstractController
} }
// 检测视频状态 // 检测视频状态
if ($order_inquiry_video_records['video_status'] == 3 || $order_inquiry_video_records['video_status'] == 4){ if ($order_inquiry_video_record['video_status'] == 3 || $order_inquiry_video_record['video_status'] == 4){
// 已开始/结束通话，进入房间动作不做处理 // 已开始/结束通话，进入房间动作不做处理
return $this->TrtcSuccessReturn(); return $this->TrtcSuccessReturn();
} }
// 修改视频状态 // 修改视频状态
$params = array(); $params = array();
$params['records_id'] = $order_inquiry_video_records['records_id']; $params['records_id'] = $order_inquiry_video_record['records_id'];
$data = array(); $data = array();
$data['video_status'] = 2; $data['video_status'] = 2;
@ -1874,14 +1874,14 @@ class CallBackController extends AbstractController
break; break;
case '102': // 解散房间 case '102': // 解散房间
// 检测视频状态 // 检测视频状态
if ($order_inquiry_video_records['video_status'] == 4){ if ($order_inquiry_video_record['video_status'] == 4){
// 已结束通话，解散房间动作不做处理 // 已结束通话，解散房间动作不做处理
return $this->TrtcSuccessReturn(); return $this->TrtcSuccessReturn();
} }
// 修改视频状态 // 修改视频状态
$params = array(); $params = array();
$params['records_id'] = $order_inquiry_video_records['records_id']; $params['records_id'] = $order_inquiry_video_record['records_id'];
$data = array(); $data = array();
$data['video_status'] = 4; $data['video_status'] = 4;
@ -1894,19 +1894,19 @@ class CallBackController extends AbstractController
break; break;
case '201': // 视频推流 case '201': // 视频推流
// 检测视频状态 // 检测视频状态
if ($order_inquiry_video_records['video_status'] == 4){ if ($order_inquiry_video_record['video_status'] == 4){
// 已结束通话，视频推流动作不做处理 // 已结束通话，视频推流动作不做处理
return $this->TrtcSuccessReturn(); return $this->TrtcSuccessReturn();
} }
if ($order_inquiry_video_records['video_status'] == 3){ if ($order_inquiry_video_record['video_status'] == 3){
// 已开始通话，视频推流动作不做处理 // 已开始通话，视频推流动作不做处理
return $this->TrtcSuccessReturn(); return $this->TrtcSuccessReturn();
} }
// 修改视频状态 // 修改视频状态
$params = array(); $params = array();
$params['records_id'] = $order_inquiry_video_records['records_id']; $params['records_id'] = $order_inquiry_video_record['records_id'];
$data = array(); $data = array();
$data['video_status'] = 3; $data['video_status'] = 3;
@ -1919,7 +1919,7 @@ class CallBackController extends AbstractController
break; break;
case '203': // 音频推流 case '203': // 音频推流
// 检测视频状态 // 检测视频状态
if ($order_inquiry_video_records['video_status'] == 4){ if ($order_inquiry_video_record['video_status'] == 4){
// 已结束通话，音频推流动作不做处理 // 已结束通话，音频推流动作不做处理
return $this->TrtcSuccessReturn(); return $this->TrtcSuccessReturn();
} }
@ -2029,7 +2029,7 @@ class CallBackController extends AbstractController
} }
$request_params = json_decode($request_params,true); $request_params = json_decode($request_params,true);
return $this->recordingSuccessReturn();
// 验证参数 // 验证参数
if (empty($request_params['EventGroupId'])){ if (empty($request_params['EventGroupId'])){
return $this->recordingErrorReturn("回调事件组为空"); return $this->recordingErrorReturn("回调事件组为空");
@ -2056,7 +2056,7 @@ class CallBackController extends AbstractController
return $this->recordingErrorReturn("回调地址推送错误"); return $this->recordingErrorReturn("回调地址推送错误");
} }
if (!in_array($request_params['EventType'],[102,103,201,203])){ if (!in_array($request_params['EventType'],[301,312])){
return $this->recordingSuccessReturn(); return $this->recordingSuccessReturn();
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {

2
app/Model/OrderInquiryVideoRecord.php
View File

@ -26,7 +26,7 @@ class OrderInquiryVideoRecord extends Model
/** /**
* The table associated with the model. * The table associated with the model.
*/ */
protected ?string $table = 'order_inquiry_video_records'; protected ?string $table = 'order_inquiry_video_record';
/** /**
* The attributes that are mass assignable. * The attributes that are mass assignable.

4
app/Services/InquiryService.php
View File

@ -1394,8 +1394,8 @@ class InquiryService extends BaseService
// 检测是否已开过视频 // 检测是否已开过视频
$params = array(); $params = array();
$params['order_inquiry_id'] = $order_inquiry_id; $params['order_inquiry_id'] = $order_inquiry_id;
$order_inquiry_video_records = OrderInquiryVideoRecord::getOne($params); $order_inquiry_video_record = OrderInquiryVideoRecord::getOne($params);
if (!empty($order_inquiry_video_records)) { if (!empty($order_inquiry_video_record)) {
$is_video = true; // 是否已开视频（0:否 1:是） $is_video = true; // 是否已开视频（0:否 1:是）
} }
} }

8
app/Services/VideoService.php
View File

@ -93,8 +93,8 @@ class VideoService extends BaseService
// 检测是否已开过视频 // 检测是否已开过视频
$params = array(); $params = array();
$params['order_inquiry_id'] = $order_inquiry_id; $params['order_inquiry_id'] = $order_inquiry_id;
$order_inquiry_video_records = OrderInquiryVideoRecord::getOne($params); $order_inquiry_video_record = OrderInquiryVideoRecord::getOne($params);
if (!empty($order_inquiry_video_records)) { if (!empty($order_inquiry_video_record)) {
return fail(HttpEnumCode::HTTP_ERROR, "已开过视频，无需再修改预约时间"); return fail(HttpEnumCode::HTTP_ERROR, "已开过视频，无需再修改预约时间");
} }
@ -280,8 +280,8 @@ class VideoService extends BaseService
$data['room_id'] = $order_inquiry_video_reservation['room_id']; $data['room_id'] = $order_inquiry_video_reservation['room_id'];
$data['video_status'] = 1; $data['video_status'] = 1;
$data['start_video_time'] = date('Y-m-d H:i:s', time()); $data['start_video_time'] = date('Y-m-d H:i:s', time());
$order_inquiry_video_records = OrderInquiryVideoRecord::addOrderInquiryVideoRecord($data); $order_inquiry_video_record = OrderInquiryVideoRecord::addOrderInquiryVideoRecord($data);
if (empty($order_inquiry_video_records)) { if (empty($order_inquiry_video_record)) {
Db::rollBack(); Db::rollBack();
return fail(HttpEnumCode::SERVER_ERROR, "发起视频失败"); return fail(HttpEnumCode::SERVER_ERROR, "发起视频失败");
} }