mkm/work
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化推送数据结构

Browse Source 
Signed-off-by: vilson <545522390@qq.com>
This commit is contained in:
vilson 2019-07-12 14:36:52 +08:00
parent 90e2128459
commit 5374158453
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/index/controller/Index.php
View File

@ -22,6 +22,7 @@ use app\common\Model\TaskLike;
use app\common\Model\TaskMember;
use app\common\Model\TaskStages;
use app\common\Model\Notify;
use app\common\Model\TaskWorkflowRule;
use controller\BasicApi;
use Exception;
use Firebase\JWT\JWT;
@ -236,7 +237,7 @@ class Index extends BasicApi
}
$messageService = new MessageService();
$messageService->bindUid($clientId, $uid);
$messageService->joinGroup($clientId, 'project');
$messageService->joinGroup($clientId, getCurrentOrganizationCode());
$this->success('', $uid);
}

12
application/project/behavior/Task.php
View File

@ -227,9 +227,11 @@ class Task
$notifyData['content'] = $task['name'];
$notifyData['avatar'] = $member['avatar'];
$taskMembers = TaskMember::where(['task_code' => $task['code']])->select()->toArray();
$socketMessage = $socketGroupMessage = ['content' => $notifyData['content'], 'title' => $notifyData['title'], 'data' => ['organizationCode' => getCurrentOrganizationCode(), 'projectCode' => $task['project_code'], 'taskCode' => $task['code']]];
$socketAction = $notifyData['action'];
$messageService = new MessageService();
$messageDingTalk = new DingTalk();
if ($taskMembers) {
$messageService = new MessageService();
$messageDingTalk = new DingTalk();
foreach ($taskMembers as $taskMember) {
if ($taskMember['member_code'] == $data['memberCode']) {
continue;//跳过产生者
@ -250,10 +252,14 @@ class Task
}
}
if (isOpenNoticePush()) {
$messageService->sendToUid($taskMember['member_code'], ['content' => $notifyData['content'], 'title' => $notifyData['title'], 'data' => ['organizationCode' => getCurrentOrganizationCode(), 'projectCode' => $task['project_code'], 'taskCode' => $task['code']], 'notify' => $result], $notifyData['action']);
$socketMessage['notify'] = $result;
$messageService->sendToUid($taskMember['member_code'], $socketMessage, $socketAction);
}
}
}
//通知所有组织内的成员
$project = \app\common\Model\Project::where(['code' => $task['project_code']])->field('organization_code')->find();
$messageService->sendToGroup($project['organization_code'], $socketGroupMessage, 'organization:task');
}
}
}