【操盘手】 流量分发支持选择账号分配

Server/application/api/controller/AccountController.php

@@ -516,6 +516,59 @@ class AccountController extends BaseController
         }
     }
 
+     /**
+     * 修改部门权限
+     * @return \think\response\Json
+     */
+    public function setPrivileges($id = '')
+    {
+        // 获取授权token
+        $authorization = trim($this->request->header('authorization', $this->authorization));
+        if (empty($authorization)) {
+            return errorJson('缺少授权信息');
+        }
+
+        try {
+            // 获取并验证请求参数
+            $id = !empty($id) ? $id : $this->request->param('id', 0);
+
+            if (empty($id)) {
+                return errorJson('部门ID不能为空');
+            }
+       
+
+            // 验证部门是否存在
+            $department = CompanyModel::where('id', $id)->find();
+            if (empty($department)) {
+                return errorJson('部门不存在');
+            }
+
+            // 构建请求参数
+            $params = [
+                'departmentId' => $id,
+                'privilegeIds' => [1001,1002,1004,1023,1406,20003,20021,20022,20023,20032,20041,20049,20054,20055,20060,20100,20102,20107],
+                'syncPrivilege' => true
+            ];
+
+            // 设置请求头
+            $headerData = ['client:system'];
+            $header = setHeader($headerData, $authorization, 'json');
+
+            // 发送请求修改部门
+            $result = requestCurl($this->baseUrl . 'api/Department/privileges', $params, 'PUT', $header, 'json');
+            $response = handleApiResponse($result);
+
+
+            return successJson([], '部门权限修改成功');
+        } catch (\Exception $e) {
+            return errorJson('修改部门权限失败：' . $e->getMessage());
+        }
+    }
+
+
+
+
+
     /************************ 私有辅助方法 ************************/
 
     /**

Server/application/cunkebao/config/route.php

@@ -66,6 +66,7 @@ Route::group('v1/', function () {
         Route::get('moments-records', 'app\cunkebao\controller\WorkbenchController@getMomentsRecords'); // 获取朋友圈发布记录列表
         Route::get('device-labels', 'app\cunkebao\controller\WorkbenchController@getDeviceLabels'); // 获取设备微信好友标签统计
         Route::get('group-list', 'app\cunkebao\controller\WorkbenchController@getGroupList'); // 获取群列表
+        Route::get('account-list', 'app\cunkebao\controller\WorkbenchController@getAccountList'); // 获取账号列表
     });
 
     // 内容库相关

Server/application/cunkebao/controller/WorkbenchController.php

@@ -137,6 +137,7 @@ class WorkbenchController extends Controller
                     $config->endTime = $param['endTime'];
                     $config->devices = json_encode($param['devices'], JSON_UNESCAPED_UNICODE);
                     $config->pools = json_encode($param['pools'], JSON_UNESCAPED_UNICODE);
+                    $config->account = json_encode($param['account'], JSON_UNESCAPED_UNICODE);
                     $config->createTime = time();
                     $config->updateTime = time();
                     $config->save();
@@ -186,7 +187,7 @@ class WorkbenchController extends Controller
                 $query->field('workbenchId,syncInterval,syncCount,syncType,startTime,endTime,accountType,devices,contentLibraries');
             },
             'trafficConfig' => function($query) {
-                $query->field('workbenchId,distributeType,maxPerDay,timeType,startTime,endTime,devices,pools');
+                $query->field('workbenchId,distributeType,maxPerDay,timeType,startTime,endTime,devices,pools,account');
             },
             'groupPush' => function($query) {
                 $query->field('workbenchId,pushType,startTime,endTime,maxPerDay,pushOrder,isLoop,status,groups,contentLibraries');
@@ -276,6 +277,7 @@ class WorkbenchController extends Controller
                             $item->config = $item->trafficConfig;
                             $item->config->devices = json_decode($item->config->devices, true);
                             $item->config->pools = json_decode($item->config->pools, true);
+                            $item->config->account = json_decode($item->config->account, true);
                             $config_item = Db::name('workbench_traffic_config_item')->where(['workbenchId' => $item->id])->order('id DESC')->find();
                             $item->config->lastUpdated = !empty($config_item) ? date('Y-m-d H:i',$config_item['createTime']) : '--';
 
@@ -296,13 +298,7 @@ class WorkbenchController extends Controller
                                 }
                             })->count();
 
-                            $totalAccounts = Db::table('s2_company_account')
-                            ->alias('a')
-                            ->where(['a.departmentId' => $item->companyId, 'a.status' => 0])
-                            ->whereNotLike('a.userName', '%_offline%')
-                            ->whereNotLike('a.userName', '%_delete%')
-                            ->group('a.id')
-                            ->count();
+                            $totalAccounts = count($item->config->account);
 
                             $dailyAverage = Db::name('workbench_traffic_config_item')
                             ->where('workbenchId', $item->id)
@@ -368,7 +364,7 @@ class WorkbenchController extends Controller
                 $query->field('workbenchId,syncInterval,syncCount,syncType,startTime,endTime,accountType,devices,contentLibraries');
             },
             'trafficConfig' => function($query) {
-                $query->field('workbenchId,distributeType,maxPerDay,timeType,startTime,endTime,devices,pools');
+                $query->field('workbenchId,distributeType,maxPerDay,timeType,startTime,endTime,devices,pools,account');
             },
             'groupPush' => function($query) {
                 $query->field('workbenchId,pushType,startTime,endTime,maxPerDay,pushOrder,isLoop,status,groups,contentLibraries');
@@ -450,56 +446,54 @@ class WorkbenchController extends Controller
                     }])
                     ->order('id', 'desc')
                     ->select();
-                    
 
+                     // 处理JSON字段
+                        foreach ($contentLibraryList as &$item) {
+                            $item['sourceFriends'] = json_decode($item['sourceFriends'] ?: '[]', true);
+                            $item['sourceGroups'] = json_decode($item['sourceGroups'] ?: '[]', true);
+                            $item['keywordInclude'] = json_decode($item['keywordInclude'] ?: '[]', true);
+                            $item['keywordExclude'] = json_decode($item['keywordExclude'] ?: '[]', true);
+                            // 添加创建人名称
+                            $item['creatorName'] = $item['user']['username'] ?? '';
+                            $item['itemCount'] = Db::name('content_item')->where('libraryId', $item['id'])->count();
 
-                      // 处理JSON字段
-        foreach ($contentLibraryList as &$item) {
-            $item['sourceFriends'] = json_decode($item['sourceFriends'] ?: '[]', true);
-            $item['sourceGroups'] = json_decode($item['sourceGroups'] ?: '[]', true);
-            $item['keywordInclude'] = json_decode($item['keywordInclude'] ?: '[]', true);
-            $item['keywordExclude'] = json_decode($item['keywordExclude'] ?: '[]', true);
-            // 添加创建人名称
-            $item['creatorName'] = $item['user']['username'] ?? '';
-            $item['itemCount'] = Db::name('content_item')->where('libraryId', $item['id'])->count();
+                            // 获取好友详细信息
+                            if (!empty($item['sourceFriends'] && $item['sourceType'] == 1)) {
+                                $friendIds = $item['sourceFriends'];
+                                $friendsInfo = [];
 
-            // 获取好友详细信息
-            if (!empty($item['sourceFriends'] && $item['sourceType'] == 1)) {
-                $friendIds = $item['sourceFriends'];
-                $friendsInfo = [];
+                                if (!empty($friendIds)) {
+                                    // 查询好友信息，使用wechat_friendship表
+                                    $friendsInfo = Db::name('wechat_friendship')->alias('wf')
+                                        ->field('wf.id,wf.wechatId, wa.nickname, wa.avatar')
+                                        ->join('wechat_account wa', 'wf.wechatId = wa.wechatId')
+                                        ->whereIn('wf.id', $friendIds)
+                                        ->select();
+                                }
 
-                if (!empty($friendIds)) {
-                    // 查询好友信息，使用wechat_friendship表
-                    $friendsInfo = Db::name('wechat_friendship')->alias('wf')
-                        ->field('wf.id,wf.wechatId, wa.nickname, wa.avatar')
-                        ->join('wechat_account wa', 'wf.wechatId = wa.wechatId')
-                        ->whereIn('wf.id', $friendIds)
-                        ->select();
-                }
+                                // 将好友信息添加到返回数据中
+                                $item['selectedFriends'] = $friendsInfo;
+                            }
 
-                // 将好友信息添加到返回数据中
-                $item['selectedFriends'] = $friendsInfo;
-            }
+                        
+                            if (!empty($item['sourceGroups']) && $item['sourceType'] == 2) {
+                                $groupIds = $item['sourceGroups'];
+                                $groupsInfo = [];
 
-         
-            if (!empty($item['sourceGroups']) && $item['sourceType'] == 2) {
-                $groupIds = $item['sourceGroups'];
-                $groupsInfo = [];
+                                if (!empty($groupIds)) {
+                                    // 查询群组信息
+                                    $groupsInfo = Db::name('wechat_group')->alias('g')
+                                        ->field('g.id, g.chatroomId, g.name, g.avatar, g.ownerWechatId')
+                                        ->whereIn('g.id', $groupIds)
+                                        ->select();
+                                }
 
-                if (!empty($groupIds)) {
-                    // 查询群组信息
-                    $groupsInfo = Db::name('wechat_group')->alias('g')
-                        ->field('g.id, g.chatroomId, g.name, g.avatar, g.ownerWechatId')
-                        ->whereIn('g.id', $groupIds)
-                        ->select();
-                }
+                                // 将群组信息添加到返回数据中
+                                $item['selectedGroups'] = $groupsInfo;
+                            }
 
-                // 将群组信息添加到返回数据中
-                $item['selectedGroups'] = $groupsInfo;
-            }
-
-            unset($item['user']); // 移除关联数据
-        }
+                            unset($item['user']); // 移除关联数据
+                        }
                     $workbench->config->contentLibraryList = $contentLibraryList;
 
                     unset($workbench->groupPush, $workbench->group_push);
@@ -517,6 +511,7 @@ class WorkbenchController extends Controller
                     $workbench->config = $workbench->trafficConfig;
                     $workbench->config->devices = json_decode($workbench->config->devices, true);
                     $workbench->config->pools = json_decode($workbench->config->pools, true);
+                    $workbench->config->account = json_decode($workbench->config->account, true);
                     $config_item = Db::name('workbench_traffic_config_item')->where(['workbenchId' => $workbench->id])->order('id DESC')->find();
                     $workbench->config->lastUpdated = !empty($config_item) ? date('Y-m-d H:i',$config_item['createTime']) : '--';
                     
@@ -860,6 +855,7 @@ class WorkbenchController extends Controller
                         $newConfig->membersPerGroup = $config->membersPerGroup;
                         $newConfig->devices = $config->devices;
                         $newConfig->targetGroups = $config->targetGroups;
+                        $newConfig->account = $config->account;
                         $newConfig->save();
                     }
                     break;
@@ -1307,6 +1303,9 @@ class WorkbenchController extends Controller
     {
         $deviceIds = $this->request->param('deviceIds', '');
         $companyId = $this->request->userInfo['companyId'];
+        $page = $this->request->param('page', 1);
+        $limit = $this->request->param('limit', 10);
+        $keyword = $this->request->param('keyword', '');
 
         $where = [
             ['wc.companyId', '=', $companyId],
@@ -1323,7 +1322,6 @@ class WorkbenchController extends Controller
             ->where($where)
             ->field('wa.id,wa.wechatId,wa.nickName,wa.labels')
             ->select();
-
         $labels = [];
         $wechatIds = [];
         foreach ($wechatAccounts as $account) {
@@ -1340,14 +1338,27 @@ class WorkbenchController extends Controller
         // 去重（只保留一个）
         $labels = array_values(array_unique($labels));
         $wechatIds = array_unique($wechatIds);
-        
+
+        // 搜索过滤
+        if (!empty($keyword)) {
+            $labels = array_filter($labels, function($label) use ($keyword) {
+                return mb_stripos($label, $keyword) !== false;
+            });
+            $labels = array_values($labels); // 重新索引数组
+        }
+
+
+
+        // 分页处理
+        $labels2 = array_slice($labels, ($page - 1) * $limit, $limit);
+
         // 统计数量
         $newLabel = [];
-        foreach ($labels as $label) {
+        foreach ($labels2 as $label) {
             $friendCount = Db::table('s2_wechat_friend')
-                ->whereIn('ownerWechatId',$wechatIds)
-                ->where('labels', 'like', '%"'.$label.'"%')
-                ->count();
+            ->whereIn('ownerWechatId',$wechatIds)
+            ->where('labels', 'like', '%"'.$label.'"%')
+            ->count();
             $newLabel[] = [
                 'label' => $label,
                 'count' => $friendCount
@@ -1355,7 +1366,14 @@ class WorkbenchController extends Controller
         }
 
         // 返回结果
-        return json(['code' => 200, 'msg' => '获取成功', 'data' => $newLabel,'total'=> count($newLabel)]);
+        return json([
+            'code' => 200, 
+            'msg' => '获取成功', 
+            'data' => [
+                'list' => $newLabel,
+                'total' => count($labels),
+            ]
+        ]);
     }
 
 
@@ -1401,4 +1419,26 @@ class WorkbenchController extends Controller
     }
 
 
+    public function getAccountList()
+    {
+        $companyId = $this->request->userInfo['companyId'];
+        $page = $this->request->param('page', 1);
+        $limit = $this->request->param('limit', 10);
+        $query = Db::table('s2_company_account')
+        ->alias('a')
+        ->where(['a.departmentId' => $companyId, 'a.status' => 0])
+        ->whereNotLike('a.userName', '%_offline%')
+        ->whereNotLike('a.userName', '%_delete%');
+
+        $total = $query->count();
+        $list = $query->field('a.id,a.userName,a.realName,a.nickname,a.memo')
+        ->page($page, $limit)
+        ->select();
+
+        
+
+        return json(['code' => 200, 'msg' => '获取成功', 'data' => ['total' => $total,'list' => $list]]);
+    }
+
+
 } 

Server/application/cunkebao/controller/device/GetDeviceListV1Controller.php

@@ -77,7 +77,7 @@ class GetDeviceListV1Controller extends BaseController
                 'l.wechatId',
                 'a.nickname', 'a.alias', '0 totalFriend'
             ])
-            ->leftJoin('device_wechat_login l', 'd.id = l.deviceId and l.alive =' . DeviceWechatLoginModel::ALIVE_WECHAT_ACTIVE)
+            ->leftJoin('device_wechat_login l', 'd.id = l.deviceId and l.alive =' . DeviceWechatLoginModel::ALIVE_WECHAT_ACTIVE . ' and l.companyId = d.companyId')
             ->leftJoin('wechat_account a', 'l.wechatId = a.wechatId')
             ->order('d.id desc');
 

Server/application/cunkebao/validate/Workbench.php

@@ -55,7 +55,7 @@ class Workbench extends Validate
         'timeType' => 'requireIf:type,5|in:1,2',
         'startTime' => 'requireIf:type,5|dateFormat:H:i',
         'endTime' => 'requireIf:type,5|dateFormat:H:i',
-
+        'account' => 'requireIf:type,5|array|min:1',
          // 通用参数
          'devices' => 'requireIf:type,1,2,5|array',
     ];
@@ -141,7 +141,10 @@ class Workbench extends Validate
         'devices.require' => '请选择设备',
         'devices.array' => '设备格式错误',
         'targetGroups.require' => '请选择目标用户组',
-        'targetGroups.array' => '目标用户组格式错误'
+        'targetGroups.array' => '目标用户组格式错误',
+        'account.requireIf' => '流量分发时必须选择分发账号',
+        'account.array' => '分发账号格式错误',
+        'account.min' => '至少选择一个分发账号',
     ];
 
     /**

Server/application/job/WorkbenchTrafficDistributeJob.php

@@ -69,13 +69,18 @@ class WorkbenchTrafficDistributeJob
         if (!$this->isTimeRange($config) && $config['timeType'] == 2) {
             return;
         }
-
         // 获取当天未超额的可用账号
+        if(empty($config['account'])){
+            Log::error("流量分发工作台 {$workbench->id} 未配置分发的客服");
+            return;
+        }
+        $accountIds = json_decode($config['account'],true);
         $todayStart = strtotime(date('Y-m-d 00:00:00'));
         $todayEnd = strtotime(date('Y-m-d 23:59:59'));
         $accounts = Db::table('s2_company_account')
             ->alias('a')
             ->where(['a.departmentId' => $workbench->companyId, 'a.status' => 0])
+            ->whereIn('a.id',$accountIds)
             ->whereNotLike('a.userName', '%_offline%')
             ->whereNotLike('a.userName', '%_delete%')
             ->leftJoin('workbench_traffic_config_item wti', "wti.wechatAccountId = a.id AND wti.workbenchId = {$workbench->id} AND wti.createTime BETWEEN {$todayStart} AND {$todayEnd}")
@@ -83,6 +88,11 @@ class WorkbenchTrafficDistributeJob
             ->group('a.id')
             ->having('todayCount <= ' . $config['maxPerDay'])
             ->select();
+
+
+            print_r($accounts);
+            exit;
+
         $accountNum = count($accounts);
         if ($accountNum < 1) {
             Log::info("流量分发工作台 {$workbench->id} 可分配账号少于1个");

Server/application/superadmin/controller/company/CreateCompanyController.php

@@ -257,6 +257,19 @@ class CreateCompanyController extends BaseController
         }
     }
 
+    /**
+     * 设置部门权限
+     *
+     * @param array $params
+     * @return void
+     * @throws Exception
+     */
+    protected function setDepartmentPrivileges(array $params): void
+    {
+        $params = ArrHelper::getValue('companyId=id,companyId,name,memo,status', $params);
+        $result = CompanyModel::create($params);
+    }
+
     /**
      * 创建新项目
      *
@@ -276,6 +289,9 @@ class CreateCompanyController extends BaseController
             // 创建功能账号，不可登录，也非管理员，用户也不可见
             $this->createFuncUsers($params);
 
+            // 设置部门权限
+            $this->setDepartmentPrivileges($params);
+
             Db::commit();
             return ResponseHelper::success();
         } catch (Exception $e) {