diff --git a/Server/application/api/controller/DeviceController.php b/Server/application/api/controller/DeviceController.php index 7ebe1d28..33dd45d0 100644 --- a/Server/application/api/controller/DeviceController.php +++ b/Server/application/api/controller/DeviceController.php @@ -690,6 +690,11 @@ class DeviceController extends BaseController 'lastUpdateTime' => isset($item['lastUpdateTime']) ? ($item['lastUpdateTime'] == '0001-01-01T00:00:00' ? 0 : strtotime($item['lastUpdateTime'])) : 0 ]; + if (!empty($data['alive'])){ + $data['aliveTime'] = time(); + } + + // 使用imei作为唯一性判断 $device = DeviceModel::where('id', $item['id'])->find(); diff --git a/Server/application/api/controller/WechatController.php b/Server/application/api/controller/WechatController.php index 947b0e1d..b3903bc4 100644 --- a/Server/application/api/controller/WechatController.php +++ b/Server/application/api/controller/WechatController.php @@ -43,7 +43,6 @@ class WechatController extends BaseController 'pageIndex' => !empty($pageIndex) ? $pageIndex : $this->request->param('pageIndex', 0), 'pageSize' => !empty($pageSize) ? $pageSize : $this->request->param('pageSize', 10) ]; - // 设置请求头 $headerData = ['client:system']; $header = setHeader($headerData, $authorization, 'plain'); @@ -51,7 +50,6 @@ class WechatController extends BaseController // 发送请求获取基本信息 $result = requestCurl($this->baseUrl . 'api/WechatAccount/list', $params, 'GET', $header); $response = handleApiResponse($result); - // 保存基本数据到数据库 if (!empty($response['results'])) { foreach ($response['results'] as $item) { @@ -169,6 +167,12 @@ class WechatController extends BaseController 'wechatAlive' => isset($data['wechatAlive'][$wechatId]) ? (int)$data['wechatAlive'][$wechatId] : 0, 'updateTime' => time() ]; + + if (!empty($updateData['wechatAlive'])) { + $updateData['wechatAliveTime'] = time(); + } + + // 更新数据库 Db::table('s2_wechat_account') ->where('id', $wechatId)