no message
This commit is contained in:
parent
81a16c235f
commit
f3d4d3199f
@ -143,11 +143,6 @@ class ProjectController extends AbstractController
|
|||||||
'userid' => $user->userid,
|
'userid' => $user->userid,
|
||||||
]);
|
]);
|
||||||
return AbstractModel::transaction(function() use ($insertColumns, $project) {
|
return AbstractModel::transaction(function() use ($insertColumns, $project) {
|
||||||
$dialog = WebSocketDialog::createGroup($project->name, $project->userid, 'project');
|
|
||||||
if (empty($dialog)) {
|
|
||||||
return Base::retError('创建失败');
|
|
||||||
}
|
|
||||||
$project->dialog_id = $dialog->id;
|
|
||||||
$project->save();
|
$project->save();
|
||||||
ProjectUser::createInstance([
|
ProjectUser::createInstance([
|
||||||
'project_id' => $project->id,
|
'project_id' => $project->id,
|
||||||
|
@ -42,6 +42,23 @@ class Project extends AbstractModel
|
|||||||
{
|
{
|
||||||
use SoftDeletes;
|
use SoftDeletes;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param $value
|
||||||
|
* @return int|mixed
|
||||||
|
*/
|
||||||
|
public function getDialogIdAttribute($value)
|
||||||
|
{
|
||||||
|
if ($value === 0) {
|
||||||
|
$userid = $this->projectUser->pluck('userid')->toArray();
|
||||||
|
$dialog = WebSocketDialog::createGroup($this->name, $userid, 'project');
|
||||||
|
if ($dialog) {
|
||||||
|
$this->dialog_id = $value = $dialog->id;
|
||||||
|
$this->save();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $value;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return \Illuminate\Database\Eloquent\Relations\HasMany
|
* @return \Illuminate\Database\Eloquent\Relations\HasMany
|
||||||
*/
|
*/
|
||||||
|
@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
|
use App\Module\Base;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class WebSocketDialog
|
* Class WebSocketDialog
|
||||||
*
|
*
|
||||||
@ -32,10 +34,11 @@ class WebSocketDialog extends AbstractModel
|
|||||||
* @param string $name 聊天室名称
|
* @param string $name 聊天室名称
|
||||||
* @param int|array $userid 加入的会员ID或会员ID组
|
* @param int|array $userid 加入的会员ID或会员ID组
|
||||||
* @param string $group_type 聊天室类型
|
* @param string $group_type 聊天室类型
|
||||||
* @return self
|
* @return self|null
|
||||||
*/
|
*/
|
||||||
public static function createGroup($name, $userid, $group_type = '')
|
public static function createGroup($name, $userid, $group_type = '')
|
||||||
{
|
{
|
||||||
|
$result = AbstractModel::transaction(function () use ($userid, $group_type, $name) {
|
||||||
$dialog = self::createInstance([
|
$dialog = self::createInstance([
|
||||||
'type' => 'group',
|
'type' => 'group',
|
||||||
'name' => $name,
|
'name' => $name,
|
||||||
@ -50,7 +53,9 @@ class WebSocketDialog extends AbstractModel
|
|||||||
])->save();
|
])->save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return $dialog;
|
return Base::retSuccess('success', $dialog);
|
||||||
|
});
|
||||||
|
return Base::isSuccess($result) ? $result['data'] : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -65,6 +70,7 @@ class WebSocketDialog extends AbstractModel
|
|||||||
if (empty($dialog)) {
|
if (empty($dialog)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
$result = AbstractModel::transaction(function () use ($dialog, $userid) {
|
||||||
foreach (is_array($userid) ? $userid : [$userid] as $value) {
|
foreach (is_array($userid) ? $userid : [$userid] as $value) {
|
||||||
if ($value > 0) {
|
if ($value > 0) {
|
||||||
WebSocketDialogUser::createInstance([
|
WebSocketDialogUser::createInstance([
|
||||||
@ -73,7 +79,8 @@ class WebSocketDialog extends AbstractModel
|
|||||||
])->save();
|
])->save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
});
|
||||||
|
return Base::isSuccess($result);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -116,7 +123,7 @@ class WebSocketDialog extends AbstractModel
|
|||||||
* 获取会员对话(没有自动创建)
|
* 获取会员对话(没有自动创建)
|
||||||
* @param int $userid 会员ID
|
* @param int $userid 会员ID
|
||||||
* @param int $userid2 另一个会员ID
|
* @param int $userid2 另一个会员ID
|
||||||
* @return self
|
* @return self|null
|
||||||
*/
|
*/
|
||||||
public static function checkUserDialog($userid, $userid2)
|
public static function checkUserDialog($userid, $userid2)
|
||||||
{
|
{
|
||||||
@ -128,6 +135,7 @@ class WebSocketDialog extends AbstractModel
|
|||||||
if ($dialogUser->count() >= 2) {
|
if ($dialogUser->count() >= 2) {
|
||||||
return $dialogUser[0];
|
return $dialogUser[0];
|
||||||
}
|
}
|
||||||
|
$result = AbstractModel::transaction(function () use ($userid2, $userid) {
|
||||||
$dialog = self::createInstance([
|
$dialog = self::createInstance([
|
||||||
'type' => 'user',
|
'type' => 'user',
|
||||||
]);
|
]);
|
||||||
@ -140,7 +148,9 @@ class WebSocketDialog extends AbstractModel
|
|||||||
'dialog_id' => $dialog->id,
|
'dialog_id' => $dialog->id,
|
||||||
'userid' => $userid2,
|
'userid' => $userid2,
|
||||||
])->save();
|
])->save();
|
||||||
return $dialog;
|
return Base::retSuccess('success', $dialog);
|
||||||
|
});
|
||||||
|
return Base::isSuccess($result) ? $result['data'] : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -36,7 +36,7 @@ class WebSocketDialogMsg extends AbstractModel
|
|||||||
* @param int $dialog_id 会话ID(即 聊天室ID)
|
* @param int $dialog_id 会话ID(即 聊天室ID)
|
||||||
* @param array $msg 发送的消息
|
* @param array $msg 发送的消息
|
||||||
* @param int $sender 发送的会员ID(默认自己,0为系统)
|
* @param int $sender 发送的会员ID(默认自己,0为系统)
|
||||||
* @return array|bool
|
* @return array
|
||||||
*/
|
*/
|
||||||
public static function addGroupMsg($dialog_id, $msg, $sender = 0)
|
public static function addGroupMsg($dialog_id, $msg, $sender = 0)
|
||||||
{
|
{
|
||||||
@ -54,7 +54,7 @@ class WebSocketDialogMsg extends AbstractModel
|
|||||||
$dialogMsg->dialog_id = $dialog->id;
|
$dialogMsg->dialog_id = $dialog->id;
|
||||||
$dialogMsg->save();
|
$dialogMsg->save();
|
||||||
//
|
//
|
||||||
$userids = WebSocketDialogUser::whereDialogId($dialog->id)->where('userid', '!=', $dialogMsg->userid)->pluck('userid');
|
$userids = WebSocketDialogUser::whereDialogId($dialog->id)->where('userid', '!=', $dialogMsg->userid)->pluck('userid')->toArray();
|
||||||
if ($userids) {
|
if ($userids) {
|
||||||
PushTask::push([
|
PushTask::push([
|
||||||
'userid' => $userids,
|
'userid' => $userids,
|
||||||
@ -74,7 +74,7 @@ class WebSocketDialogMsg extends AbstractModel
|
|||||||
* @param int $userid 接收的会员ID
|
* @param int $userid 接收的会员ID
|
||||||
* @param array $msg 发送的消息
|
* @param array $msg 发送的消息
|
||||||
* @param int $sender 发送的会员ID(默认自己,0为系统)
|
* @param int $sender 发送的会员ID(默认自己,0为系统)
|
||||||
* @return array|bool
|
* @return array
|
||||||
*/
|
*/
|
||||||
public static function addUserMsg($userid, $msg, $sender = 0)
|
public static function addUserMsg($userid, $msg, $sender = 0)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user