Merge branch 'develop' of https://e.coding.net/g-xtcy5189/cunkebao/cunkebao_v3 into develop

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

@@ -2,6 +2,7 @@
 
 namespace app\superadmin\controller\company;
 
+use app\api\controller\DeviceController;
 use app\common\model\Company as CompanyModel;
 use app\common\model\User as UsersModel;
 use app\superadmin\controller\BaseController;
@@ -105,6 +106,23 @@ class CreateCompanyController extends BaseController
         return $this;
     }
 
+    /**
+     * 设备创建分组
+     *
+     * @param array $params
+     * @return void
+     * @throws \Exception
+     */
+    protected function s2CreateDeviceGroup(array $params): void
+    {
+        $respon = (new DeviceController())->createGroup($params, true);
+        $respon = json_decode($respon, true);
+
+        if ($respon['code'] != 200) {
+            throw new \Exception('设备分组添加错误', 210 . $respon['code']);
+        }
+    }
+
     /**
      * S2 部分
      *
@@ -120,6 +138,9 @@ class CreateCompanyController extends BaseController
             throw new \Exception('S2返参异常', 210402);
         }
 
+        // 设备创建分组
+        $this->s2CreateDeviceGroup(['groupName' => $params['name']]);
+
         return array_merge($params, [
             'companyId'    => $department['departmentId'],
             's2_accountId' => $department['id'],

Server/application/superadmin/controller/devices/GetAddResultedDevicesController.php

@@ -45,31 +45,32 @@ class GetAddResultedDevicesController extends Controller
     protected function migrateData(int $accountId): void
     {
         $companyId = $this->getCompanyIdByAccountId($accountId);
-        $ids = $this->getAllDevicesIdWithInCompany($companyId);
+        $deviceIds = $this->getAllDevicesIdWithInCompany($companyId) ?: [0];
 
         // 从 s2_device 导入数据。
-        $this->getNewDeviceFromS2_device($ids);
+        $this->getNewDeviceFromS2_device($deviceIds, $companyId);
     }
 
     /**
      * 从 s2_device 导入数据。
      *
      * @param array $ids
-     * @return array
+     * @param int $companyId
+     * @return void
      */
-    protected function getNewDeviceFromS2_device(array $ids): array
+    protected function getNewDeviceFromS2_device(array $ids, int $companyId): void
     {
+        $ids = implode(',', $ids);
+
         $sql = "insert into ck_device(`id`, `imei`, `model`, phone, operatingSystem,memo,alive,brand,rooted,xPosed,softwareVersion,extra,createTime,updateTime,deleteTime,companyId)  
                 select 
                     d.id,d.imei,d.model,d.phone,d.operatingSystem,d.memo,d.alive,d.brand,d.rooted,d.xPosed,d.softwareVersion,d.extra,d.createTime,d.lastUpdateTime,d.deleteTime,a.departmentId companyId
                 from s2_device d 
                     join s2_company_account a on d.currentAccountId = a.id
-                where isDeleted = 0 and deletedAndStop = 0 and d.id not in (:ids)
+                where isDeleted = 0 and deletedAndStop = 0 and d.id not in ({$ids}) and a.departmentId = {$companyId}
                 ";
 
-        dd($sql);
-
-        Db::query($sql, ['ids' => implode(',', $ids)]);
+        Db::query($sql);
     }
 
     /**
@@ -90,12 +91,12 @@ class GetAddResultedDevicesController extends Controller
         );
 
         $result = json_decode($result, true);
-        $result = $result['data']['results'][0];
+        $result = $result['data']['results'][0] ?? false;
 
-        return (
+        return $result ? (
             // 125是前端延迟5秒 + 轮询120次 1次/s
-            time() - strtotime($result['lastUpdateTime']) <= 125
-        );
+            time() - strtotime($result['lastUpdateTime']) <= 65
+        ) : false;
     }
 
     /**