Procházet zdrojové kódy

gledale 上传联调

moell před 10 měsíci
rodič
revize
15b77134b8
1 změnil soubory, kde provedl 11 přidání a 16 odebrání
  1. 11 16
      app/Services/File/BIM/Glendale/Glendale.php

+ 11 - 16
app/Services/File/BIM/Glendale/Glendale.php

@@ -3,6 +3,7 @@
 namespace App\Services\File\BIM\Glendale;
 
 use App\Models\Enums\BimFileConvertStatus;
+use App\Services\File\BIM\BIMDriverEnum;
 use App\Services\File\BIM\Contacts\BIMContact;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Auth;
@@ -14,36 +15,30 @@ class Glendale implements BIMContact
 
     public function uploadFile(UploadedFile $file, array $params = [])
     {
-        /*dump([
-            'name' => $file->getClientOriginalName(),
-            'initiatingUser' => Auth::user()->name,
-            'uniqueCode' => Uuid::uuid4(),
-            'priority' => 205,
-            'isCAD' => $params['is_cad'],
-            'modelDownloadUrl' => Storage::url($params['pathname'])
-        ]);*/
-
         $uploadFormData = [
-            ['name' => 'file', 'contents' =>  fopen($file, 'r')]
+            ['name' => 'file', 'contents' =>  fopen($file, 'r+'), 'filename' => $file->getClientOriginalName()]
         ];
 
-        $result = Client::getInstance()->post('/api/app/model/transcode-file', [
-            'query_params' => [
+        $result = Client::getInstance()->post('/api/app/model/upload-file', [
+            'query' => [
                 'input' => json_encode([
                     'name' => $file->getClientOriginalName(),
                     'initiatingUser' => Auth::user()->name,
                     'uniqueCode' => Uuid::uuid4(),
                     'priority' => 205,
                     'isCAD' => $params['is_cad'],
-                    'modelDownloadUrl' => $params['pathname'],
                     "configJson" => ExtensionModelConfig::getConfigOption($params['extension']),
                 ])
             ],
-            //'multipart' => $uploadFormData,
+            'multipart' => $uploadFormData,
         ]);
 
-        dump($result);
-
+        return [
+            'bim_data_set_id' => $result['datas']['lightweightName'],
+            'bim_file_id' => $result['datas']['lightweightName'],
+            'bim_convert_status' => 0,
+            'bim_driver' => BIMDriverEnum::GLENDALE->value,
+        ];
     }
 
     public function downloadSourceFile()