diff --git a/Server/application/common/model/CompanyAccount.php b/Server/application/common/model/CompanyAccount.php
deleted file mode 100644
index 12964bb7..00000000
--- a/Server/application/common/model/CompanyAccount.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-namespace app\common\model;
-
-use think\Model;
-
-/**
- * 公司账户模型类
- */
-class CompanyAccount extends Model
-{
-    /**
-     * 数据表名
-     * @var string
-     */
-    protected $table = 'tk_company_account';
-
-    /**
-     * 主键
-     * @var string
-     */
-    protected $pk = 'id';
-
-    /**
-     * 自动写入时间戳
-     * @var bool
-     */
-    protected $autoWriteTimestamp = true;
-
-    /**
-     * 创建时间字段
-     * @var string
-     */
-    protected $createTime = 'createTime';
-
-    /**
-     * 更新时间字段
-     * @var string
-     */
-    protected $updateTime = 'updateTime';
-
-    /**
-     * 隐藏属性
-     * @var array
-     */
-    protected $hidden = ['passwordMd5', 'passwordLocal', 'secret'];
-
-    /**
-     * 字段类型
-     * @var array
-     */
-    protected $type = [
-        'id' => 'integer',
-        'tenantId' => 'integer',
-        'accountType' => 'integer',
-        'companyId' => 'integer',
-        'useGoogleSecretKey' => 'boolean',
-        'hasVerifyGoogleSecret' => 'boolean',
-        'lastLoginTime' => 'integer',
-        'createTime' => 'integer',
-        'updateTime' => 'integer'
-    ];
-
-    /**
-     * 获取公司账户信息
-     * @param string $userName 用户名
-     * @param string $password 密码（MD5加密后的）
-     * @return array|null
-     */
-    public static function getAccount($userName, $password)
-    {
-        // 查询账户
-        $account = self::where('userName', $userName)
-                    ->find();
-        
-        if (!$account) {
-            return null;
-        }
-        
-        // 验证密码
-        if ($account->passwordMd5 !== $password) {
-            return null;
-        }
-        
-        // 更新登录信息
-        $account->lastLoginIp = request()->ip();
-        $account->lastLoginTime = time();
-        $account->save();
-        
-        return [
-            'id' => $account->id,
-            'tenantId' => $account->tenantId,
-            'userName' => $account->userName,
-            'realName' => $account->realName,
-            'nickname' => $account->nickname,
-            'avatar' => $account->avatar,
-            'accountType' => $account->accountType,
-            'companyId' => $account->companyId,
-            'lastLoginIp' => $account->lastLoginIp,
-            'lastLoginTime' => $account->lastLoginTime
-        ];
-    }
-
-    /**
-     * 通过租户ID获取账户信息
-     * @param int $companyId 租户ID
-     * @return array|null
-     */
-    public static function getAccountByCompanyId($companyId)
-    {
-        // 查询账户
-        $account = self::where('companyId', $companyId)->find();
-        
-        if (!$account) {
-            return null;
-        }
-        
-        return [
-            'id' => $account->id,
-            'tenantId' => $account->tenantId,
-            'userName' => $account->userName,
-            'realName' => $account->realName,
-            'nickname' => $account->nickname,
-            'avatar' => $account->avatar,
-            'accountType' => $account->accountType,
-            'companyId' => $account->companyId,
-            'lastLoginIp' => $account->lastLoginIp,
-            'lastLoginTime' => $account->lastLoginTime
-        ];
-    }
-
-} 
\ No newline at end of file
diff --git a/Server/application/common/model/DeviceWechatLogin.php b/Server/application/common/model/DeviceWechatLogin.php
index 290ed32a..5b18762a 100644
--- a/Server/application/common/model/DeviceWechatLogin.php
+++ b/Server/application/common/model/DeviceWechatLogin.php
@@ -9,6 +9,9 @@ use think\Model;
  */
 class DeviceWechatLogin extends Model
 {
+    const ALIVE_WECHAT_ACTIVE = 1;  // 微信在线
+    const ALIVE_WECHAT_DIED = 0;    // 微信离线
+
     // 登录日志最新登录 alive = 1，旧数据全部设置0
     protected $name = 'device_wechat_login';
 
@@ -25,6 +28,10 @@ class DeviceWechatLogin extends Model
      */
     public static function getDevicesLatestLogin(array $deviceIds): array
     {
-        return self::fieldRaw('max(id) as lastedId,deviceId')->whereIn('deviceId', $deviceIds)->group('deviceId')->select()->toArray();
+        return static::fieldRaw('max(id) as lastedId,deviceId')
+            ->whereIn('deviceId', $deviceIds)
+            ->group('deviceId')
+            ->select()
+            ->toArray();
     }
 }
\ No newline at end of file
diff --git a/Server/application/common/model/User.php b/Server/application/common/model/User.php
index f691a82c..9117d783 100644
--- a/Server/application/common/model/User.php
+++ b/Server/application/common/model/User.php
@@ -9,9 +9,9 @@ class User extends Model
 {
     use SoftDelete;
 
-    const ADMIN_STP = 1;
+    const ADMIN_STP = 1;     // 主操盘手账号
     const ADMIN_OTP = 0;
-    const NOT_USER = -1;
+    const NOT_USER = -1;      // 非登录用户用于任务操作的（S2系统专属）
     const MASTER_USER = 1;    // 操盘手
     const CUSTOMER_USER = 2;  // 门店接待
     const STATUS_STOP = 0;    // 禁用状态
diff --git a/Server/application/common/model/WechatAccount.php b/Server/application/common/model/WechatAccount.php
index 5deae91f..4c7da606 100644
--- a/Server/application/common/model/WechatAccount.php
+++ b/Server/application/common/model/WechatAccount.php
@@ -16,5 +16,4 @@ class WechatAccount extends Model
     protected $autoWriteTimestamp = true;
     protected $createTime = 'createTime';
     protected $updateTime = 'updateTime';
-    protected $defaultSoftDelete = 0;
 } 
\ No newline at end of file
diff --git a/Server/application/common/model/WechatFriend.php b/Server/application/common/model/WechatFriend.php
index c2c5be77..5c121c82 100644
--- a/Server/application/common/model/WechatFriend.php
+++ b/Server/application/common/model/WechatFriend.php
@@ -3,12 +3,15 @@
 namespace app\common\model;
 
 use think\Model;
+use think\model\concern\SoftDelete;
 
 /**
  * 微信好友模型类
  */
 class WechatFriend extends Model
 {
+    use SoftDelete;
+
     // 设置表名
     protected $name = 'wechat_friend';
 
@@ -16,5 +19,6 @@ class WechatFriend extends Model
     protected $autoWriteTimestamp = true;
     protected $createTime = 'createTime';
     protected $updateTime = 'updateTime';
+    protected $deleteTime = 'deleteTime';
     protected $defaultSoftDelete = 0;
 } 
\ No newline at end of file
diff --git a/Server/application/cunkebao/config/route.php b/Server/application/cunkebao/config/route.php
index 0ce2a9dc..415e811c 100644
--- a/Server/application/cunkebao/config/route.php
+++ b/Server/application/cunkebao/config/route.php
@@ -10,7 +10,7 @@ Route::group('v1/', function () {
 
     // 设备管理相关
     Route::group('devices', function () {
-        Route::get('add-results', 'app\cunkebao\controller\device\GetAddResultedDevicesController@index');           // 更新设备任务配置
+        Route::get('add-results', 'app\cunkebao\controller\device\GetAddResultedV1Controller@index');                // 更新设备任务配置
         Route::get(':id/related-accounts', 'app\cunkebao\controller\device\GetRelatedAccountsV1Controller@index');   // 设备关联微信账号路由
         Route::get(':id/handle-logs', 'app\cunkebao\controller\device\GetDeviceHandleLogsV1Controller@index');       // 获取设备操作记录
         Route::get('', 'app\cunkebao\controller\device\GetDeviceListV1Controller@index');                            // 获取设备列表
@@ -23,10 +23,10 @@ Route::group('v1/', function () {
 
     // 设备微信相关
     Route::group('device/wechats', function () {
+        Route::get('', 'app\cunkebao\controller\wechat\GetWechatsOnDevicesV1Controller@index');                      // 获取在线微信账号列表
         Route::get('friends', 'app\cunkebao\controller\DeviceWechat@getFriends'); // 获取微信好友列表
         Route::get('count', 'app\cunkebao\controller\DeviceWechat@count');       // 获取在线微信账号数量
         Route::get('device-count', 'app\cunkebao\controller\DeviceWechat@deviceCount'); // 获取有登录微信的设备数量
-        Route::get('', 'app\cunkebao\controller\DeviceWechat@index');     // 获取在线微信账号列表
         Route::get(':id', 'app\cunkebao\controller\DeviceWechat@detail'); // 获取微信号详情
         Route::put('refresh', 'app\cunkebao\controller\DeviceWechat@refresh');  // 刷新设备微信状态
         Route::post('transfer-friends', 'app\cunkebao\controller\DeviceWechat@transferFriends'); // 微信好友转移
diff --git a/Server/application/cunkebao/controller/device/GetAddResultedDevicesController.php b/Server/application/cunkebao/controller/device/GetAddResultedV1Controller.php
similarity index 98%
rename from Server/application/cunkebao/controller/device/GetAddResultedDevicesController.php
rename to Server/application/cunkebao/controller/device/GetAddResultedV1Controller.php
index 86a166a0..e9cb20fa 100644
--- a/Server/application/cunkebao/controller/device/GetAddResultedDevicesController.php
+++ b/Server/application/cunkebao/controller/device/GetAddResultedV1Controller.php
@@ -12,7 +12,7 @@ use think\Db;
 /**
  * 设备控制器
  */
-class GetAddResultedDevicesController extends BaseController
+class GetAddResultedV1Controller extends BaseController
 {
     /**
      * 通过账号id 获取项目id。
diff --git a/Server/application/cunkebao/controller/device/GetDeviceListV1Controller.php b/Server/application/cunkebao/controller/device/GetDeviceListV1Controller.php
index aa7ef9a9..de211114 100644
--- a/Server/application/cunkebao/controller/device/GetDeviceListV1Controller.php
+++ b/Server/application/cunkebao/controller/device/GetDeviceListV1Controller.php
@@ -5,7 +5,7 @@ namespace app\cunkebao\controller\device;
 use app\common\model\Device as DeviceModel;
 use app\common\model\DeviceUser as DeviceUserModel;
 use app\common\model\User as UserModel;
-use app\common\model\WechatFriend;
+use app\common\model\WechatFriend as WechatFriendModel;
 use app\cunkebao\controller\BaseController;
 use library\ResponseHelper;
 
@@ -22,8 +22,6 @@ class GetDeviceListV1Controller extends BaseController
      */
     protected function makeWhere(array $params = []): array
     {
-        $where = [];
-
         // 关键词搜索（同时搜索IMEI和备注）
         if (!empty($keyword = $this->request->param('keyword'))) {
             $where[] = ['exp', "d.imei LIKE '%{$keyword}%' OR d.memo LIKE '%{$keyword}%'"];
@@ -47,8 +45,10 @@ class GetDeviceListV1Controller extends BaseController
     protected function makeDeviceIdsWhere(): array
     {
         $deviceIds = DeviceUserModel::where(
-            $this->getUserInfo('id'),
-            $this->getUserInfo('companyId')
+            [
+                'userId'    => $this->getUserInfo('id'),
+                'companyId' => $this->getUserInfo('companyId')
+            ]
         )
             ->column('deviceId');
 
@@ -56,7 +56,7 @@ class GetDeviceListV1Controller extends BaseController
             throw new \Exception('请联系管理员绑定设备', 403);
         }
 
-        $where['d.id'] = ['in', $deviceIds];
+        $where['d.id'] = array('in', $deviceIds);
 
         return $where;
     }
@@ -65,11 +65,9 @@ class GetDeviceListV1Controller extends BaseController
      * 获取设备列表
      *
      * @param array $where 查询条件
-     * @param int $page 页码
-     * @param int $limit 每页数量
      * @return \think\Paginator 分页对象
      */
-    protected function getDeviceList(array $where, int $page = 1, int $limit = 10): \think\Paginator
+    protected function getDeviceList(array $where): \think\Paginator
     {
         $query = DeviceModel::alias('d')
             ->field([
@@ -101,16 +99,16 @@ class GetDeviceListV1Controller extends BaseController
      */
     protected function countFriend(\think\Paginator $list): array
     {
-        $result = [];
+        $resultSets = [];
 
         foreach ($list->items() as $item) {
-            $section = $item->toArray();
+            $sections = $item->toArray();
 
             if ($item->wechatId) {
-                $section['totalFriend'] = WechatFriend::where(['ownerWechatId' => $section['wechatId']])->count();
+                $sections['totalFriend'] = WechatFriendModel::where(['ownerWechatId' => $item->wechatId])->count();
             }
 
-            array_push($result, $section);
+            array_push($result, $sections);
         }
 
         return $result;
@@ -126,8 +124,10 @@ class GetDeviceListV1Controller extends BaseController
             if ($this->getUserInfo('isAdmin') == UserModel::ADMIN_STP) {
                 $where = $this->makeWhere();
                 $result = $this->getDeviceList($where);
-            } else {
-                $where = $this->makeWhere($this->makeDeviceIdsWhere());
+            }
+
+            else {
+                $where = $this->makeWhere( $this->makeDeviceIdsWhere() );
                 $result = $this->getDeviceList($where);
             }
 
diff --git a/Server/application/cunkebao/controller/wechat/GetWechatsOnDevicesV1Controller.php b/Server/application/cunkebao/controller/wechat/GetWechatsOnDevicesV1Controller.php
new file mode 100644
index 00000000..81cce9c1
--- /dev/null
+++ b/Server/application/cunkebao/controller/wechat/GetWechatsOnDevicesV1Controller.php
@@ -0,0 +1,263 @@
+<?php
+
+namespace app\cunkebao\controller\wechat;
+
+use app\common\model\Device as DeviceModel;
+use app\common\model\Device as DevicesModel;
+use app\common\model\DeviceUser as DeviceUserModel;
+use app\common\model\DeviceWechatLogin as DeviceWechatLoginModel;
+use app\common\model\User as UserModel;
+use app\common\model\WechatAccount as WechatAccountModel;
+use app\common\model\WechatFriend as WechatFriendModel;
+use app\cunkebao\controller\BaseController;
+use library\ResponseHelper;
+
+/**
+ * 微信控制器
+ */
+class GetWechatsOnDevicesV1Controller extends BaseController
+{
+    /**
+     * TODO 计算今日可添加好友数量
+     *
+     * @param string $wechatId
+     * @return int
+     */
+    protected function getCanAddFriendCount(string $wechatId): int
+    {
+        $canAddFriendCount = 20; // 最多限制 20 次
+
+        return $canAddFriendCount < 0 ? 0 : $canAddFriendCount;
+    }
+
+    /**
+     * TODO 计算今日新增好友数量
+     *
+     * @param string $wechatId
+     * @return int
+     */
+    protected function getTodayNewFriendCount(string $wechatId): int
+    {
+        return 0;
+    }
+
+    /**
+     * TODO 获取微信加友状态
+     *
+     * @param string $wechatId
+     * @return int
+     */
+    protected function getWechatAddFriendStatus(string $wechatId): int
+    {
+        return 1;
+    }
+
+    /**
+     * 获取微信好友数量
+     *
+     * @param string $ownerWechatId
+     * @return int
+     */
+    protected function getFriendsCount(string $ownerWechatId): int
+    {
+        return WechatFriendModel::where(compact('ownerWechatId'))->count();
+    }
+
+    /**
+     * 获取微信所属设备
+     *
+     * @param string $wechatId
+     * @return string
+     */
+    protected function getWhereOnDevice(string $wechatId): string
+    {
+        return DeviceModel::alias('d')
+            ->where(
+                [
+                    'l.wechatId' => $wechatId,
+                    'l.alive'    => DeviceWechatLoginModel::ALIVE_WECHAT_ACTIVE
+                ]
+            )
+            ->join('device_wechat_login l', 'd.id = l.deviceId')
+            ->value('d.imei');
+    }
+
+    /**
+     * 主操盘手获取项目下所有设备的id
+     *
+     * @return array
+     * @throws \Exception
+     */
+    protected function getCompanyDevicesId(): array
+    {
+        return DevicesModel::where(
+            [
+                'companyId' => $this->getUserInfo('companyId')
+            ]
+        )
+            ->column('id');
+    }
+
+    /**
+     * 非主操盘手获取分配的设备
+     *
+     * @return array
+     */
+    protected function getUserDevicesId(): array
+    {
+        return DeviceUserModel::where(
+            [
+                'userId'    => $this->getUserInfo('id'),
+                'companyId' => $this->getUserInfo('companyId')
+            ]
+        )
+            ->column('deviceId');
+    }
+
+    /**
+     * 根据不同角色，显示的设备数量不同
+     *
+     * @return array
+     * @throws \Exception
+     */
+    protected function getDevicesId(): array
+    {
+        return ($this->getUserInfo('isAdmin') == UserModel::ADMIN_STP)
+            ? $this->getCompanyDevicesId()  // 主操盘手获取所有的设备
+            : $this->getUserDevicesId();    // 非主操盘手获取分配的设备
+    }
+
+    /**
+     * 获取有登录设备的微信id
+     *
+     * @return array
+     */
+    protected function getWechatIdsOnDevices(): array
+    {
+        // 关联设备id查询，过滤掉已删除的设备
+        if (empty($deviceIds = $this->getDevicesId())) {
+            throw new \Exception('暂无设备数据', 200);
+        }
+
+        return DeviceWechatLoginModel::where(
+            [
+                'companyId' => $this->getUserInfo('companyId'),
+                'alive'     => DeviceWechatLoginModel::ALIVE_WECHAT_ACTIVE,
+            ]
+        )
+            ->where('deviceId', 'in', $deviceIds)
+            ->column('wechatId');
+    }
+
+    /**
+     * 获取设备最新活跃时间
+     *
+     * @param string $wechatId
+     * @return string
+     */
+    protected function getLatestActiveTime(string $wechatId): string
+    {
+        return date('Y-m-d H:i:s', strtotime('-1 day'));
+    }
+
+    /**
+     * 构建查询条件
+     *
+     * @param array $params
+     * @return array
+     */
+    protected function makeWhere(array $params = []): array
+    {
+        if (empty($wechatIds = $this->getWechatIdsOnDevices())) {
+            throw new \Exception('设备尚未有登录微信', 200);
+        }
+
+        // 关键词搜索（同时搜索微信号和昵称）
+        if (!empty($keyword = $this->request->param('keyword'))) {
+            $where[] = ['exp', "w.alias LIKE '%{$keyword}%' OR w.nickname LIKE '%{$keyword}%'"];
+        }
+
+        $where['w.wechatId'] = array('in', implode(',', $wechatIds));
+
+        return array_merge($params, $where);
+    }
+
+    /**
+     * 获取在线微信账号列表
+     *
+     * @param array $where
+     * @return \think\Paginator 分页对象
+     */
+    protected function getOnlineWechatList(array $where): \think\Paginator
+    {
+        $query = WechatAccountModel::alias('w')
+            ->field([
+                'w.id', 'w.wechatId', 'w.nickname', 'w.avatar', 'w.s2_wechatAccountId'
+            ])
+            ->order('w.id desc');
+
+        foreach ($where as $key => $value) {
+            if (is_numeric($key) && is_array($value) && isset($value[0]) && $value[0] === 'exp') {
+                $query->whereExp('', $value[1]);
+                continue;
+            }
+
+            if (is_array($value)) {
+                $query->where($key, ...$value);
+                continue;
+            }
+
+            $query->where($key, $value);
+        }
+
+        return $query->paginate($this->request->param('limit/d', 10), false, ['page' => $this->request->param('page/d', 1)]);
+    }
+
+    /**
+     * 构建返回数据
+     *
+     * @param \think\Paginator $result
+     * @return array
+     */
+    protected function makeResultedSet(\think\Paginator $result): array
+    {
+        $resultSets = [];
+
+        foreach ($result->items() as $item) {
+            $sections = $item->toArray() + [
+                    'times'        => $this->getCanAddFriendCount($item->wechatId),
+                    'addedCount'   => $this->getTodayNewFriendCount($item->wechatId),
+                    'wechatStatus' => $this->getWechatAddFriendStatus($item->wechatId),
+                    'totalFriend'  => $this->getFriendsCount($item->wechatId),
+                    'deviceMemo'   => $this->getWhereOnDevice($item->wechatId),
+                    'activeTime'   => $this->getLatestActiveTime($item->wechatId),
+                ];
+
+            array_push($resultSets, $sections);
+        }
+
+        return $resultSets;
+    }
+
+    /**
+     * 获取在线微信账号列表
+     * @return \think\response\Json
+     */
+    public function index()
+    {
+        try {
+            $result = $this->getOnlineWechatList(
+                $this->makeWhere()
+            );
+
+            return ResponseHelper::success(
+                [
+                    'list'  => $this->makeResultedSet($result),
+                    'total' => $result->total(),
+                ]
+            );
+        } catch (\Exception $e) {
+            return ResponseHelper::error($e->getMessage(), $e->getCode());
+        }
+    }
+}
\ No newline at end of file
diff --git a/Server/application/cunkebao/model/WechatAccount.php b/Server/application/cunkebao/model/WechatAccount.php
index df58cc7e..b8a68ca2 100644
--- a/Server/application/cunkebao/model/WechatAccount.php
+++ b/Server/application/cunkebao/model/WechatAccount.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace app\cunkebao\model;
 
 use think\Model;
@@ -10,10 +11,10 @@ class WechatAccount extends Model
 {
     // 设置表名
     protected $name = 'wechat_account';
-    
+
     /**
      * 获取在线微信账号数量
-     * 
+     *
      * @param array $where 额外的查询条件
      * @return int 微信账号数量
      */
@@ -22,20 +23,20 @@ class WechatAccount extends Model
         $condition = [
             'deviceAlive' => 1,
             'wechatAlive' => 1,
-            'isDeleted' => 0
+            'isDeleted'   => 0
         ];
-        
+
         // 合并额外条件
         if (!empty($where)) {
             $condition = array_merge($condition, $where);
         }
-        
+
         return self::where($condition)->count();
     }
-    
+
     /**
      * 获取有登录微信的设备数量
-     * 
+     *
      * @param array $where 额外的查询条件
      * @return int 设备数量
      */
@@ -43,55 +44,14 @@ class WechatAccount extends Model
     {
         $condition = [
             'deviceAlive' => 1,
-            'isDeleted' => 0
+            'isDeleted'   => 0
         ];
-        
+
         // 合并额外条件
         if (!empty($where)) {
             $condition = array_merge($condition, $where);
         }
-        
+
         return self::where($condition)->count();
     }
-    
-    /**
-     * 获取在线微信账号列表
-     * 
-     * @param array $where 额外的查询条件
-     * @param string $order 排序方式
-     * @param int $page 页码
-     * @param int $limit 每页数量
-     * @return \think\Paginator 分页对象
-     */
-    public static function getOnlineWechatList($where = [], $order = 'id desc', $page = 1, $limit = 10)
-    {
-        $condition = [
-            'isDeleted' => 0
-        ];
-        
-        // 合并额外条件
-        if (!empty($where)) {
-            $condition = array_merge($condition, $where);
-        }
-        
-        return self::where($condition)
-            ->field([
-                'id', 
-                'wechatId', 
-                'accountNickname', 
-                'nickname',
-                'accountUserName', 
-                'avatar', 
-                'wechatAlive', 
-                'deviceAlive',
-                'totalFriend', 
-                'maleFriend',
-                'femaleFriend',
-                'imei',
-                'deviceMemo',
-                'yesterdayMsgCount'
-            ])
-            ->order($order)
-            ->paginate($limit, false, ['page' => $page]);
-    }
 } 
\ No newline at end of file