代码提交

2025-10-14 17:03:05 +08:00
parent f2c25927eb
commit da63930f5e
9 changed files with 369 additions and 188 deletions
--- a/Server/application/api/controller/AccountController.php
+++ b/Server/application/api/controller/AccountController.php
@@ -62,9 +62,7 @@ class AccountController extends BaseController

            // 保存数据到数据库
            if (!empty($response['results'])) {
-                foreach ($response['results'] as $item) {
-                    $this->saveAccount($item);
-                }
+                $this->saveAccount($response['results']);
            }

            if ($isInner) {
@@ -703,42 +701,41 @@ class AccountController extends BaseController
     * 保存账号数据到数据库
     * @param array $item 账号数据
     */
-    private function saveAccount($item)
+    private function saveAccount($data)
    {
        // 将日期时间字符串转换为时间戳
        $createTime = isset($item['createTime']) ? strtotime($item['createTime']) : null;
        $deleteTime = isset($item['deleteTime']) ? strtotime($item['deleteTime']) : null;
+        $sqlData = [];
+        foreach ($data as $item) {
+            $sqlData[] = [
+                'id' => $item['id'],
+                'accountType' => isset($item['accountType']) ? $item['accountType'] : 0,
+                'status' => isset($item['status']) ? $item['status'] : 0,
+                'tenantId' => isset($item['tenantId']) ? $item['tenantId'] : 0,
+                'userName' => isset($item['userName']) ? $item['userName'] : '',
+                'realName' => isset($item['realName']) ? $item['realName'] : '',
+                'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
+                'avatar' => isset($item['avatar']) ? $item['avatar'] : '',
+                'phone' => isset($item['phone']) ? $item['phone'] : '',
+                'memo' => isset($item['memo']) ? $item['memo'] : '',
+                'createTime' => $createTime,
+                'creator' => isset($item['creator']) ? $item['creator'] : 0,
+                'creatorUserName' => isset($item['creatorUserName']) ? $item['creatorUserName'] : '',
+                'creatorRealName' => isset($item['creatorRealName']) ? $item['creatorRealName'] : '',
+                'departmentId' => isset($item['departmentId']) ? $item['departmentId'] : 0,
+                'departmentName' => isset($item['departmentName']) ? $item['departmentName'] : '',
+                'privilegeIds' => isset($item['privilegeIds']) ? json_encode($item['privilegeIds']) : json_encode([]),
+                'alive' => isset($item['alive']) ? $item['alive'] : false,
+                'hasXiakeAccount' => isset($item['hasXiakeAccount']) ? $item['hasXiakeAccount'] : false,
+                'isDeleted' => isset($item['isDeleted']) ? $item['isDeleted'] : false,
+                'deleteTime' => $deleteTime
+            ];
+        }

-        $data = [
-            'id' => $item['id'],
-            'accountType' => isset($item['accountType']) ? $item['accountType'] : 0,
-            'status' => isset($item['status']) ? $item['status'] : 0,
-            'tenantId' => isset($item['tenantId']) ? $item['tenantId'] : 0,
-            'userName' => isset($item['userName']) ? $item['userName'] : '',
-            'realName' => isset($item['realName']) ? $item['realName'] : '',
-            'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
-            'avatar' => isset($item['avatar']) ? $item['avatar'] : '',
-            'phone' => isset($item['phone']) ? $item['phone'] : '',
-            'memo' => isset($item['memo']) ? $item['memo'] : '',
-            'createTime' => $createTime,
-            'creator' => isset($item['creator']) ? $item['creator'] : 0,
-            'creatorUserName' => isset($item['creatorUserName']) ? $item['creatorUserName'] : '',
-            'creatorRealName' => isset($item['creatorRealName']) ? $item['creatorRealName'] : '',
-            'departmentId' => isset($item['departmentId']) ? $item['departmentId'] : 0,
-            'departmentName' => isset($item['departmentName']) ? $item['departmentName'] : '',
-            'privilegeIds' => isset($item['privilegeIds']) ? json_encode($item['privilegeIds']) : json_encode([]),
-            'alive' => isset($item['alive']) ? $item['alive'] : false,
-            'hasXiakeAccount' => isset($item['hasXiakeAccount']) ? $item['hasXiakeAccount'] : false,
-            'isDeleted' => isset($item['isDeleted']) ? $item['isDeleted'] : false,
-            'deleteTime' => $deleteTime
-        ];

        // 使用tenantId作为唯一性判断
-        $account = CompanyAccountModel::where('id', $item['id'])->find();
-        if ($account) {
-            $account->save($data);
-        } else {
-            CompanyAccountModel::create($data);
-        }
+        $account = new CompanyAccountModel();
+        $account->saveAll($account);
    }
 } 
--- a/Server/application/api/controller/WechatChatroomController.php
+++ b/Server/application/api/controller/WechatChatroomController.php
@@ -54,11 +54,9 @@ class WechatChatroomController extends BaseController
            // 保存数据到数据库
            if (!empty($response['results'])) {
                $isUpdate = false;
-                foreach ($response['results'] as $item) {
-                    $updated = $this->saveChatroom($item);
-                    if($updated && $isDel == 0){
-                        $isUpdate = true;
-                    }
+                $updated = $this->saveChatroom($response['results']);
+                if($updated && $isDel == 0){
+                    $isUpdate = true;
                }
            }

@@ -80,44 +78,51 @@ class WechatChatroomController extends BaseController
     * 保存群聊数据到数据库
     * @param array $item 群聊数据
     */
-    private function saveChatroom($item)
+    private function saveChatroom($data)
    {
-        $data = [
-            'id' => $item['id'],
-            'wechatAccountId' => $item['wechatAccountId'],
-            'wechatAccountAlias' => $item['wechatAccountAlias'],
-            'wechatAccountWechatId' => $item['wechatAccountWechatId'],
-            'wechatAccountAvatar' => $item['wechatAccountAvatar'],
-            'wechatAccountNickname' => $item['wechatAccountNickname'],
-            'chatroomId' => $item['chatroomId'],
-            'hasMe' => $item['hasMe'],
-            'chatroomOwnerNickname' => isset($item['chatroomOwnerNickname']) ? $item['chatroomOwnerNickname'] : '',
-            'chatroomOwnerAvatar' => isset($item['chatroomOwnerAvatar']) ? $item['chatroomOwnerAvatar'] : '',
-            'conRemark' => isset($item['conRemark']) ? $item['conRemark'] : '',
-            'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
-            'pyInitial' => isset($item['pyInitial']) ? $item['pyInitial'] : '',
-            'quanPin' => isset($item['quanPin']) ? $item['quanPin'] : '',
-            'chatroomAvatar' => isset($item['chatroomAvatar']) ? $item['chatroomAvatar'] : '',
-            'members' => is_array($item['members']) ? json_encode($item['members']) : json_encode([]),
-            'isDeleted' => isset($item['isDeleted']) ? $item['isDeleted'] : 0,
-            'deleteTime' => !empty($item['isDeleted']) ? strtotime($item['deleteTime']) : 0,
-            'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
-            'accountId' => isset($item['accountId']) ? $item['accountId'] : 0,
-            'accountUserName' => isset($item['accountUserName']) ? $item['accountUserName'] : '',   
-            'accountRealName' => isset($item['accountRealName']) ? $item['accountRealName'] : '',
-            'accountNickname' => isset($item['accountNickname']) ? $item['accountNickname'] : '',
-            'groupId' => isset($item['groupId']) ? $item['groupId'] : 0,
-            'updateTime' => time()
-        ];
+
+        $sqlData = [];
+        foreach ($data as $item) {
+            $sqlData[] = [
+                'id' => $item['id'],
+                'wechatAccountId' => $item['wechatAccountId'],
+                'wechatAccountAlias' => $item['wechatAccountAlias'],
+                'wechatAccountWechatId' => $item['wechatAccountWechatId'],
+                'wechatAccountAvatar' => $item['wechatAccountAvatar'],
+                'wechatAccountNickname' => $item['wechatAccountNickname'],
+                'chatroomId' => $item['chatroomId'],
+                'hasMe' => $item['hasMe'],
+                'chatroomOwnerNickname' => isset($item['chatroomOwnerNickname']) ? $item['chatroomOwnerNickname'] : '',
+                'chatroomOwnerAvatar' => isset($item['chatroomOwnerAvatar']) ? $item['chatroomOwnerAvatar'] : '',
+                'conRemark' => isset($item['conRemark']) ? $item['conRemark'] : '',
+                'nickname' => isset($item['nickname']) ? $item['nickname'] : '',
+                'pyInitial' => isset($item['pyInitial']) ? $item['pyInitial'] : '',
+                'quanPin' => isset($item['quanPin']) ? $item['quanPin'] : '',
+                'chatroomAvatar' => isset($item['chatroomAvatar']) ? $item['chatroomAvatar'] : '',
+                'members' => is_array($item['members']) ? json_encode($item['members']) : json_encode([]),
+                'isDeleted' => isset($item['isDeleted']) ? $item['isDeleted'] : 0,
+                'deleteTime' => !empty($item['isDeleted']) ? strtotime($item['deleteTime']) : 0,
+                'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
+                'accountId' => isset($item['accountId']) ? $item['accountId'] : 0,
+                'accountUserName' => isset($item['accountUserName']) ? $item['accountUserName'] : '',
+                'accountRealName' => isset($item['accountRealName']) ? $item['accountRealName'] : '',
+                'accountNickname' => isset($item['accountNickname']) ? $item['accountNickname'] : '',
+                'groupId' => isset($item['groupId']) ? $item['groupId'] : 0,
+                'updateTime' => time()
+            ];
+        }

        // 使用chatroomId和wechatAccountId的组合作为唯一性判断
-        $chatroom = WechatChatroomModel::where('id',$item['id'])->find();
-
+        $chatroom = new WechatChatroomModel();
+        $chatroom->saveAll($sqlData);
        if ($chatroom) {
-            $chatroom->save($data);
-            return true;
-        } else {
-            WechatChatroomModel::create($data);
+            if ($chatroom->isUpdate()){
+                return true;
+            }else{
+                return false;
+            }
+
+        }else{
            return false;
        }