Browse Source

fix 模型浏览

waymen 5 months ago
parent
commit
0fe714939d

+ 6 - 0
app/Http/Resources/API/FileByObjectResource.php

@@ -2,6 +2,8 @@
 
 namespace App\Http\Resources\API;
 
+use App\Libraries\BIM\BIMFactory;
+use App\Models\Enums\BimFileConvertStatus;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\Storage;
@@ -27,6 +29,10 @@ class FileByObjectResource extends JsonResource
             'version' => $this->version,
         ];
 
+        if ($this->is_bim == 1 && $this->bimFile && $this->bimFile->convert_status == BimFileConvertStatus::DONE->value) {
+            $data['model_view_url'] = 'todo';//@todo 跟前端重新对一下判断
+        }
+
         return $data;
     }
 }

+ 4 - 1
app/Libraries/BIM/Glendale/Glendale.php

@@ -241,7 +241,10 @@ class Glendale extends BIMAbstract
         }
 
         $result = Arr::only($result, ['modelAccessAddress', 'lightweightName', 'fileOwnership', 'floorJsonURL', 'fileType', 'initiatingUser', 'modelType', 'name']);
-        $result['modelAccessAddress'] = str_replace('http://159.75.168.101:18086', 'https://gelan.autocde.com', $result['modelAccessAddress']);
+        if (isset($result['modelAccessAddress'])) {
+            $result['modelAccessAddress'] = str_replace('http://159.75.168.101:18086', 'https://gelan.autocde.com', $result['modelAccessAddress']);
+        }
+        
         // $result['baseUrl'] = config('bim.glendale.base_url');
         $result['stationUrl'] = config('bim.glendale.host');
         $result['stationToken'] = config('bim.glendale.token');