三维模型保存路径问题问题修复

监控点击跳转监控页面功能开发

back/src/main/java/com/zjugis/cpkffa/controller/ThreedModelController.java

@@ -2,6 +2,7 @@ package com.zjugis.cpkffa.controller;
 
 import com.aspose.cad.internal.P.B;
 import com.zjugis.cpkffa.config.ResultData;
+import com.zjugis.cpkffa.config.file.properties.UploadProperties;
 import com.zjugis.cpkffa.entity.ThreedModel;
 import com.zjugis.cpkffa.entity.common.SysFile;
 import com.zjugis.cpkffa.service.IThreedModelService;
@@ -25,7 +26,6 @@ public class ThreedModelController {
 //    onemap/rest/storage/save/zipModel
     @Resource
     private IThreedModelService service;
-
     /**
      * 模型位置数据保存
      * @param data
@@ -33,6 +33,7 @@ public class ThreedModelController {
      */
     @PostMapping("/zipModel")
     public ResultData uploadZipModel(@RequestBody ThreedModel data)  {
+        //模型位置由于打包文件原因 有些文件要3dhost代理导出
         Boolean result=service.save(data);
         return ResultData.ok(result);
     }

back/src/main/resources/application-common.yml

@@ -21,7 +21,7 @@ upload:
     #此typeLimit的值为上面image,doc和video的typeLimit的总和
     typeLimit: zip,war,rar,ZIP,WAR,RAR,jpg,jpeg,bmp,png,JPG,JPEG,BMP,PNG,doc,docx,wps,ppt,txt,xlsx,xls,pdf,DOC,DOCX,WPS,PPT,TXT,XLSX,XLS,PDF,avi,wmv,rm,rmvb,mp4,3gp,flv,mkv,AVI,WMV,RM,RMVB,MP4,3GP,FLV,MKV
     saveType: yyyy/MM/dd
-    url: file-resource
+    url: file
 
 logback:
   logdir: logs

back/src/main/resources/application-dev.yml

@@ -53,5 +53,5 @@ srid: 4528
 
 auth:
   enabled: true
-  white-list: /swagger-ui/**,/swagger-resources**,/v3/**,/v2/**,/file-resource/**,/video/**,/doc/**,/image/**,/base/**,/jctb/**,/sys-data-config/**,/geometry/**,/excel/**,/file-info/**,/sys-file/**,/file-content/**,/ueditor/**,/file-download/**
+  white-list: /swagger-ui/**,/swagger-resources**,/v3/**,/v2/**,/file/**,/video/**,/doc/**,/image/**,/base/**,/jctb/**,/sys-data-config/**,/geometry/**,/excel/**,/file-info/**,/sys-file/**,/file-content/**,/ueditor/**,/file-download/**
 

spatialbasicweb/src/components/cameraMap/area/LayerTree.vue

@@ -56,11 +56,9 @@ export default {
               children: updateLayers(layer.children)
             }
           }
-
           return layer
         })
       }
-
       const newLayers = updateLayers(this.layers)
       this.$emit('update:layers', newLayers)
       this.$emit('visibility-changed', { layerId, visible: !this.getLayerById(layerId).isVisible })

spatialbasicweb/src/components/common/monitorDeviceWatcher.vue

@@ -390,8 +390,7 @@
       /**
        * 通过地图打开视频
        */
-      showVideoByMap(item, flag, _theta,area) {
-        console.log('通过地图打开视频',area)
+      showVideoByMap(item, flag) {
         if (flag) {
           cameraMethod.openCamera({indexCode : item.id,face:true}).then(res => {
             console.log(res)

spatialbasicweb/src/components/map3DFun/buildingImPort/components/inputModel.vue

@@ -72,7 +72,7 @@ export default {
         uploadZipModel({"file":this.uploadFileDoc,"type":this.fileType}).then(res=>{
           console.log(res)
           if(res.data){
-            that.fileUrl = '/back/'+res.data.fileurl
+            that.fileUrl = '/3dHost/'+res.data.fileurl
             let name=res.data.filename
             if (that.fileUrl.slice(that.fileUrl.lastIndexOf('.') + 1) === that.fileType) {
               that.$emit('showModel', {

spatialbasicweb/src/views/camera-main/camera.vue

@@ -212,6 +212,12 @@ export default {
     handleVisibilityChanged({ layerId, visible }) {
       console.log(`图层 ${layerId} 可见性变为: ${visible}`)
       // 可以在这里触发实际的渲染更新
+      cameraMethod.openCamera({indexCode : layerId,face:true}).then(res => {
+        console.log(res)
+        let data = res.data;
+        //打开视频
+        window.open (data,'_blank',)
+      })
     },
     handleLayerSelected(layer) {
       console.log('选中图层:', layer)