底层新增部门和账号二合一接口

2025-04-15 08:56:26 +08:00
parent e782077fba
commit ae8624b198
14 changed files with 716 additions and 30 deletions
--- a/Server/application/api/controller/AccountController.php
+++ b/Server/application/api/controller/AccountController.php
@@ -4,6 +4,7 @@ namespace app\api\controller;

 use app\api\model\CompanyAccountModel;
 use app\api\model\CompanyModel;
+use Library\S2\Logics\AccountLogic;
 use think\facade\Request;

 /**
@@ -23,6 +24,11 @@ class AccountController extends BaseController
     */
    public function getlist($pageIndex = '',$pageSize = '',$isJob = false)
    {
+
+        $api = new AccountLogic();
+        $api->login()->create();
+
+
        // 获取授权token
        $authorization = trim($this->request->header('authorization', $this->authorization));
        if (empty($authorization)) {
@@ -133,7 +139,7 @@ class AccountController extends BaseController
            // 发送请求创建账号
            $result = requestCurl($this->baseUrl . 'api/account/newAccount', $params, 'POST', $header, 'json');
            
-            if (is_int($result)) {
+            if (is_numeric($result)) {
                return successJson($result);
            } else {
                return errorJson($result);
@@ -143,6 +149,114 @@ class AccountController extends BaseController
        }
    }

+
+
+    /**
+     * 创建新账号（包含创建部门）
+     * @return \think\response\Json
+     */
+    public function createNewAccount()
+    {
+        // 获取授权token
+        $authorization = trim($this->request->header('authorization', $this->authorization));
+        if (empty($authorization)) {
+            return errorJson('缺少授权信息');
+        }
+
+        try {
+            // 获取参数
+            $departmentName = $this->request->param('departmentName', '');
+            $departmentMemo = $this->request->param('departmentMemo', '');
+            $accountName = $this->request->param('accountName', '');
+            $accountPassword = $this->request->param('accountPassword', '');
+            $accountRealName = $this->request->param('accountRealName', '');
+            $accountNickname = $this->request->param('accountNickname', '');
+            $accountMemo = $this->request->param('accountMemo', '');
+
+            // 验证参数
+            if (empty($departmentName)) {
+                return errorJson('部门名称不能为空');
+            }
+            if (empty($accountName)) {
+                return errorJson('账号名称不能为空');
+            }
+            if (empty($accountPassword)) {
+                return errorJson('账号密码不能为空');
+            }
+
+            // 检查部门是否已存在
+            $existingDepartment = CompanyModel::where('name', $departmentName)->find();
+            if ($existingDepartment) {
+                return errorJson('部门名称已存在');
+            }
+
+            // 检查账号是否已存在
+            $existingAccount = CompanyAccountModel::where('userName', $accountName)->find();
+            if ($existingAccount) {
+                return errorJson('账号名称已存在');
+            }
+
+            // 1. 创建部门
+            $departmentParams = [
+                'name' => $departmentName,
+                'memo' => $departmentMemo,
+                'departmentIdArr' => [914],
+                'parentId' => 914
+            ];
+
+            $headerData = ['client:system'];
+            $header = setHeader($headerData, $authorization, 'json');
+            $departmentResult = requestCurl($this->baseUrl . 'api/Department/createDepartment', $departmentParams, 'POST', $header, 'json');
+            
+            if (is_numeric($departmentResult)) {
+                // 保存部门到数据库
+                $department = CompanyModel::create([
+                    'id' => $departmentResult,
+                    'name' => $departmentName,
+                    'memo' => $departmentMemo,
+                    'tenantId' => 242,
+                    'isTop' => 0,
+                    'level' => 1,
+                    'parentId' => 914,
+                    'privileges' => '',
+                    'createTime' => time(),
+                    'lastUpdateTime' => 0
+                ]);
+            } else {
+                return errorJson('创建部门失败：' . $departmentResult);
+            }
+
+            // 2. 创建账号
+            $accountParams = [
+                'userName' => $accountName,
+                'password' => $accountPassword,
+                'realName' => $accountRealName,
+                'nickname' => $accountNickname,
+                'memo' => $accountMemo,
+                'departmentId' => $departmentResult,
+                'departmentIdArr' => [914, $departmentResult]
+            ];
+
+            $accountResult = requestCurl($this->baseUrl . 'api/Account/newAccount', $accountParams, 'POST', $header, 'json');
+
+
+
+
+
+            if (!is_numeric($accountResult)) {
+                // 如果创建账号失败，删除已创建的部门
+                $this->deleteDepartment($accountResult);
+                return errorJson('创建账号失败：' . $accountResult['msg']);
+            }
+
+            return successJson($accountResult,'账号创建成功');
+        } catch (\Exception $e) {
+            return errorJson('创建账号失败：' . $e->getMessage());
+        }
+    }
+
+
+
    /************************ 部门管理相关接口 ************************/

    /**
@@ -213,9 +327,9 @@ class AccountController extends BaseController
            }

            // 检查部门名称是否已存在
-            $departmentId = CompanyModel::where('name', $name)->value('id');
+            $departmentId = CompanyModel::where('name', $name)->find();
            if (!empty($departmentId)) {
-                return errorJson('公司名称已存在');
+                return successJson($departmentId);
            }

            // 构建请求参数
@@ -238,7 +352,14 @@ class AccountController extends BaseController
                $res = CompanyModel::create([
                    'id' => $result,
                    'name' => $name,
-                    'memo' => $memo
+                    'memo' => $memo,
+                    'tenantId' => 242,
+                    'isTop' => 0,
+                    'level' => 1,
+                    'parentId' => 914,
+                    'privileges' => '',
+                    'createTime' => time(),
+                    'lastUpdateTime' => 0
                ]);
                return successJson($res);
            } else {
@@ -319,7 +440,7 @@ class AccountController extends BaseController
     * 删除部门
     * @return \think\response\Json
     */
-    public function deleteDepartment()
+    public function deleteDepartment($id = '')
    {
        // 获取授权token
        $authorization = trim($this->request->header('authorization', $this->authorization));
@@ -329,7 +450,7 @@ class AccountController extends BaseController

        try {
            // 获取并验证部门ID
-            $id = $this->request->param('id', 0);
+            $id = !empty($id) ? $id : $this->request->param('id', '');
            if (empty($id)) {
                return errorJson('部门ID不能为空');
            }
@@ -400,8 +521,8 @@ class AccountController extends BaseController
            'parentId' => isset($item['parentId']) ? $item['parentId'] : 0,
            'tenantId' => isset($item['tenantId']) ? $item['tenantId'] : 0,
            'privileges' => isset($item['privileges']) ? (is_array($item['privileges']) ? json_encode($item['privileges']) : $item['privileges']) : '',
-            'createTime' =>  isset($item['createTime']) ? $item['createTime'] : '',
-            'lastUpdateTime' => isset($item['lastUpdateTime']) ? $item['lastUpdateTime'] : ''
+            'createTime' =>  isset($item['createTime']) ? strtotime($item['createTime']) : 0,
+            'lastUpdateTime' => isset($item['lastUpdateTime']) ? ($item['lastUpdateTime'] == '0001-01-01T00:00:00' ? 0 : strtotime($item['lastUpdateTime'])) : 0
        ];

        // 使用id作为唯一性判断
--- a/Server/application/api/controller/DeviceController.php
+++ b/Server/application/api/controller/DeviceController.php
@@ -270,10 +270,10 @@ class DeviceController extends BaseController
            'currentAccountId' => isset($item['currentAccountId']) ? $item['currentAccountId'] : 0,
            'imei' => $item['imei'],
            'memo' => isset($item['memo']) ? $item['memo'] : '',
-            'createTime' => isset($item['createTime']) ? $item['createTime'] : null,
+            'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
            'isDeleted' => isset($item['isDeleted']) ? $item['isDeleted'] : false,
            'deletedAndStop' => isset($item['deletedAndStop']) ? $item['deletedAndStop'] : false,
-            'deleteTime' => isset($item['deleteTime']) ? $item['deleteTime'] : null,
+            'deleteTime' => empty($item['isDeleted']) ? 0 : strtotime($item['deleteTime']),
            'rooted' => isset($item['rooted']) ? $item['rooted'] : false,
            'xPosed' => isset($item['xPosed']) ? $item['xPosed'] : false,
            'brand' => isset($item['brand']) ? $item['brand'] : '',
@@ -282,7 +282,7 @@ class DeviceController extends BaseController
            'softwareVersion' => isset($item['softwareVersion']) ? $item['softwareVersion'] : '',
            'extra' => isset($item['extra']) ? json_encode($item['extra']) : json_encode([]),
            'phone' => isset($item['phone']) ? $item['phone'] : '',
-            'lastUpdateTime' => isset($item['lastUpdateTime']) ? $item['lastUpdateTime'] : null
+            'lastUpdateTime' => isset($item['lastUpdateTime']) ? ($item['lastUpdateTime'] == '0001-01-01T00:00:00' ? 0 : strtotime($item['lastUpdateTime'])) : 0
        ];

        // 使用imei作为唯一性判断
--- a/Server/application/api/controller/WechatChatroomController.php
+++ b/Server/application/api/controller/WechatChatroomController.php
@@ -88,8 +88,8 @@ class WechatChatroomController extends BaseController
            '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' => isset($item['deleteTime']) ? $item['deleteTime'] : 0,
-            'createTime' => isset($item['createTime']) ? $item['createTime'] : time(),
+            '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'] : '',
@@ -107,12 +107,12 @@ class WechatChatroomController extends BaseController
            WechatChatroomModel::create($data);
        }

-        // 同时保存群成员数据
-        if (!empty($item['members'])) {
-            foreach ($item['members'] as $member) {
-                $this->saveChatroomMember($member, $item['chatroomId']);
-            }
-        }
+        // // 同时保存群成员数据
+        // if (!empty($item['members'])) {
+        //     foreach ($item['members'] as $member) {
+        //         $this->saveChatroomMember($member, $item['chatroomId']);
+        //     }
+        // }
    }

    /**
--- a/Server/application/api/controller/WechatFriendController.php
+++ b/Server/application/api/controller/WechatFriendController.php
@@ -102,7 +102,7 @@ class WechatFriendController extends BaseController
            'signature' => $item['signature'],
            'isDeleted' => $item['isDeleted'],
            'isPassed' => $item['isPassed'],
-            'deleteTime' => $item['deleteTime'],
+            'deleteTime' => !empty($item['isDeleted']) ? strtotime($item['deleteTime']) : 0,
            'accountId' => $item['accountId'],
            'extendFields' => is_array($item['extendFields']) ? json_encode($item['extendFields']) : json_encode([]),
            'accountUserName' => $item['accountUserName'],
@@ -115,13 +115,13 @@ class WechatFriendController extends BaseController
            'phone' => $item['phone'],
            'thirdParty' => is_array($item['thirdParty']) ? json_encode($item['thirdParty']) : json_encode([]),
            'groupId' => $item['groupId'],
-            'passTime' => $item['passTime'],
+            'passTime' => !empty($item['isPassed']) && $item['passTime'] != '0001-01-01T00:00:00' ? strtotime($item['passTime']) : 0,
            'additionalPicture' => $item['additionalPicture'],
            'desc' => $item['desc'],
            'country' => $item['country'],
            'privince' => isset($item['privince']) ? $item['privince'] : '',
            'city' => isset($item['city']) ? $item['city'] : '',
-            'createTime' => isset($item['createTime']) ? $item['createTime'] : '',
+            'createTime' => isset($item['createTime']) ? strtotime($item['createTime']) : 0,
            'updateTime' => time()
        ];