|
@@ -48,7 +48,30 @@ interface ServiceFuseModel {
|
|
sceneData: Scene
|
|
sceneData: Scene
|
|
}
|
|
}
|
|
|
|
|
|
-const serviceToLocal = (serviceModel: ServiceFuseModel, test = false): FuseModel => ({
|
|
|
|
|
|
+const serviceToLocal = (serviceModel: ServiceFuseModel, test = false): FuseModel => {
|
|
|
|
+ let url = ""
|
|
|
|
+ console.log(serviceModel.sceneData, serviceModel.sceneData.type)
|
|
|
|
+ if ([SceneType.SWSS, SceneType.SWYDSS].includes(serviceModel.sceneData.type)) {
|
|
|
|
+ url = serviceModel.sceneData.num
|
|
|
|
+ } else {
|
|
|
|
+ switch(serviceModel.sceneData.modelDateType) {
|
|
|
|
+ case '3dgs':
|
|
|
|
+ url = serviceModel.sceneData.model3dgsUrl
|
|
|
|
+ break;
|
|
|
|
+ case 'shp':
|
|
|
|
+ url = serviceModel.sceneData.modelShpUrl
|
|
|
|
+ break;
|
|
|
|
+ default:
|
|
|
|
+ url = serviceModel.sceneData.modelGlbUrl
|
|
|
|
+ }
|
|
|
|
+ try {
|
|
|
|
+ url = JSON.parse(url)[0]
|
|
|
|
+ } catch (e) {
|
|
|
|
+ console.error(url, e)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return {
|
|
show: true,
|
|
show: true,
|
|
scale: serviceModel.transform.scale[0],
|
|
scale: serviceModel.transform.scale[0],
|
|
opacity: serviceModel.opacity || 1,
|
|
opacity: serviceModel.opacity || 1,
|
|
@@ -58,7 +81,7 @@ const serviceToLocal = (serviceModel: ServiceFuseModel, test = false): FuseModel
|
|
position: serviceModel.transform.position,
|
|
position: serviceModel.transform.position,
|
|
rotation: serviceModel.transform.rotation,
|
|
rotation: serviceModel.transform.rotation,
|
|
id: serviceModel.fusionNumId.toString(),
|
|
id: serviceModel.fusionNumId.toString(),
|
|
- url: serviceModel.sceneData ? ([SceneType.SWSS, SceneType.SWYDSS].includes(serviceModel.sceneData.type) ? serviceModel.sceneData.num : serviceModel.sceneData.modelGlbUrl) : '',
|
|
|
|
|
|
+ url,
|
|
title: serviceModel.sceneData ? (serviceModel.sceneData?.name || serviceModel.sceneData.sceneName || serviceModel.sceneData.modelTitle) : '-',
|
|
title: serviceModel.sceneData ? (serviceModel.sceneData?.name || serviceModel.sceneData.sceneName || serviceModel.sceneData.modelTitle) : '-',
|
|
modelId: serviceModel.sceneData?.modelId,
|
|
modelId: serviceModel.sceneData?.modelId,
|
|
fusionId: serviceModel.fusionId,
|
|
fusionId: serviceModel.fusionId,
|
|
@@ -67,7 +90,8 @@ const serviceToLocal = (serviceModel: ServiceFuseModel, test = false): FuseModel
|
|
raw: serviceModel.sceneData,
|
|
raw: serviceModel.sceneData,
|
|
time: serviceModel.sceneData?.createTime,
|
|
time: serviceModel.sceneData?.createTime,
|
|
status: serviceModel.sceneData ? serviceModel.sceneData.status : SceneStatus.ERR
|
|
status: serviceModel.sceneData ? serviceModel.sceneData.status : SceneStatus.ERR
|
|
-})
|
|
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
|
|
const localToService = (model: FuseModel): Omit<ServiceFuseModel, 'sceneData'> => ({
|
|
const localToService = (model: FuseModel): Omit<ServiceFuseModel, 'sceneData'> => ({
|
|
fusionId: model.fusionId,
|
|
fusionId: model.fusionId,
|