1

src/main/java/com/fdkankan/fusion/FusionApplication.java

@@ -24,6 +24,10 @@ public class FusionApplication  implements CommandLineRunner {
     private String queryPath;
     @Value("${spring.profiles.active}")
     private String environment;
+    @Value("${4dkk.laserService.basePath}")
+    private String laserWebsite;
+    @Value("${4dkk.fdService.basePath}")
+    private String meshWebsite;
     public static void main(String[] args) {
         SpringApplication.run(FusionApplication.class, args);
     }
@@ -33,6 +37,8 @@ public class FusionApplication  implements CommandLineRunner {
         CacheUtil.uploadType = uploadType;
         CacheUtil.queryPath = queryPath;
         CacheUtil.environment = environment;
+        CacheUtil.laserWebsite = laserWebsite;
+        CacheUtil.meshWebsite = meshWebsite;
 
     }
 }

src/main/java/com/fdkankan/fusion/common/util/CameraUtil.java

@@ -31,4 +31,20 @@ public class CameraUtil {
             default: return "四维看看/Mesh";
         }
     }
+
+    public static Integer getTypeByCameraType(Integer cameraType,Integer isObj) {
+        switch (cameraType){
+            case 1: return 0;
+            case 9: return 1;
+            case 10:
+                return isObj == 0 ? 2 : 4 ;
+            case 11:
+                return isObj == 0 ? 5 : 6 ;
+            case 12:
+                return 8;
+            default: return 0;
+        }
+    }
+
+
 }

src/main/java/com/fdkankan/fusion/common/util/NumTypeUtils.java

@@ -17,6 +17,7 @@ public class NumTypeUtils {
                 return false;
             case 2:
             case 5:
+            case 8:
                 return true;
         }
         return false;
@@ -41,6 +42,7 @@ public class NumTypeUtils {
             case 3 : return  1;
             case 4 : return  isObj ==1 ? 4 :2;
             case 5 : return   isObj ==1 ? 6 :5;
+            case 7 : return  8;
             default:
                 if(StringUtils.isNotBlank(three) && "yzl".equals(three)){
                     return 7;

src/main/java/com/fdkankan/fusion/config/CacheUtil.java

@@ -5,6 +5,8 @@ public class CacheUtil {
     public static String queryPath;
     public static String basePath ="/mnt/";
     public static String environment;
+    public static String laserWebsite;
+    public static String meshWebsite;
 
 
 }

src/main/java/com/fdkankan/fusion/controller/SceneController.java

@@ -4,6 +4,8 @@ import cn.hutool.core.io.FileUtil;
 import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.common.util.CameraUtil;
+import com.fdkankan.fusion.common.util.NumTypeUtils;
 import com.fdkankan.fusion.common.util.UploadToOssUtil;
 import com.fdkankan.fusion.config.CacheUtil;
 import com.fdkankan.fusion.exception.BusinessException;
@@ -86,7 +88,7 @@ public class SceneController extends BaseController{
             Long size = null;
             String sceneObjPath =null;
 
-            if(type == 2 || type == 5){  //点云
+            if(NumTypeUtils.isLaser(type)){  //点云
                 String scenePath = null;
                 if(CacheUtil.environment.contains("prod" )){
                     sceneObjPath = String.format(FilePath.LASER_OSS_PATH, num,num)+"/cloud.js" ;

src/main/java/com/fdkankan/fusion/down/FusionDownService.java

@@ -7,9 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.deepoove.poi.XWPFTemplate;
 import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.ResultData;
-import com.fdkankan.fusion.common.util.DateUtils;
-import com.fdkankan.fusion.common.util.ShellUtil;
-import com.fdkankan.fusion.common.util.UploadToOssUtil;
+import com.fdkankan.fusion.common.util.*;
 import com.fdkankan.fusion.entity.*;
 import com.fdkankan.fusion.httpClient.LaserService;
 import com.fdkankan.fusion.httpClient.response.FdkkResponse;
@@ -225,7 +223,7 @@ public class FusionDownService {
                 //下载场景离线包
                 downSwkk(caseOffPath,sceneData.getNum(),sceneData.getType());
             }
-            if(sceneData.getType() == 2 || sceneData.getType() == 5){
+            if(NumTypeUtils.isLaser(sceneData.getType())){
                 FdkkResponse sceneInfo = laserService.getSceneInfo(sceneData.getNum());
                 HashSet<String> dataSetIds = new HashSet<>();
                 if(sceneInfo != null){

src/main/java/com/fdkankan/fusion/httpClient/client/LaserClient.java

@@ -18,20 +18,20 @@ public interface LaserClient {
     /**
      * 获取深时场景数据
      */
-    @Post(value = "/laser/4dage/sceneList",interceptor = SignInterceptor.class)
+    @Post(value = "/backend/laser/4dage/sceneList",interceptor = SignInterceptor.class)
     FdkkResponse sceneList(@JSONBody LaserSceneParam param, @Header("fdToken") String token);
     /**
      * 获取深时场景数据
      */
-    @Post(value = "/laser/4dage/managerSceneList",interceptor = SignInterceptor.class)
+    @Post(value = "/backend/laser/4dage/managerSceneList",interceptor = SignInterceptor.class)
     FdkkResponse sceneList(@JSONBody LaserSceneParam param);
     /**
      * 点云生成obj场景
      */
-    @Post(value = "/laser/4dage/scene/buildSceneObj",interceptor = SignInterceptor.class)
+    @Post(value = "/backend/laser/4dage/scene/buildSceneObj",interceptor = SignInterceptor.class)
     FdkkResponse buildSceneObj(@JSONBody LaserSceneParam param,@Header ("fdToken") String token);
 
-    @Post(value = "/laser/4dage/sceneDetail",interceptor = SignInterceptor.class)
+    @Post(value = "/backend/laser/4dage/sceneDetail",interceptor = SignInterceptor.class)
     FdkkResponse sceneDetail(@JSONBody LaserSceneParam param, @Header ("fdToken") String fdToken);
 
 
@@ -39,26 +39,26 @@ public interface LaserClient {
      * 下载深时场景
      * status ：0:正在生成 1，初次生成  2，已经生成直接下载 3，重新生成
      */
-    @Post(value = "/laser/4dage/downOfflineScene",interceptor = SignInterceptor.class)
+    @Post(value = "/backend/laser/4dage/downOfflineScene",interceptor = SignInterceptor.class)
     FdkkResponse downOfflineScene(@JSONBody SSDownSceneParam param) ;
     /**
      * 检测深时场景是否需要重新生成
      *
      * status ：离线包状态是否需要重新生成 0未生成，1 不需要 2需要
      */
-    @Post(value = "/laser/4dage/downOfflineSceneStatus",interceptor = SignInterceptor.class)
+    @Post(value = "/backend/laser/4dage/downOfflineSceneStatus",interceptor = SignInterceptor.class)
     FdkkResponse downOfflineSceneStatus(@JSONBody SSDownSceneParam param) ;
 
 
     //https://uat-laser.4dkankan.com/laser/dataset/SS-t-j3nYkCDuZEN/getDataSet
-    @Get(value = "/laser/dataset/{num}/getDataSet",interceptor = SignInterceptor.class)
+    @Get(value = "/backend/laser/dataset/{num}/getDataSet",interceptor = SignInterceptor.class)
     FdkkResponse getSceneInfo(@Var("num")String num);
 
     //https://test-mix3d.4dkankan.com/laser/4dage/SS-t-j3nYkCDuZEN/getDataSetAndControlPoint
-    @Post(value = "/laser/4dage/{num}/getDataSetAndControlPoint",interceptor = SignInterceptor.class)
+    @Post(value = "/backend/laser/4dage/{num}/getDataSetAndControlPoint",interceptor = SignInterceptor.class)
     FdkkResponse getDataSetAndControlPoint(@Var("num")String num);
 
-    @Get(value = "/laser/filter/{num}/query",interceptor = SignInterceptor.class)
+    @Get(value = "/backend/laser/filter/{num}/query",interceptor = SignInterceptor.class)
     FdkkResponse getSceneInfoQuery(@Var("num")String num,@Query("datasetId") String datasetId);
 
 }

src/main/java/com/fdkankan/fusion/response/FusionAndSceneVo.java

@@ -1,6 +1,9 @@
 package com.fdkankan.fusion.response;
 
+import com.fdkankan.fusion.common.util.NumTypeUtils;
+import com.fdkankan.fusion.config.CacheUtil;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 @Data
 public class FusionAndSceneVo {
@@ -12,4 +15,20 @@ public class FusionAndSceneVo {
     private Integer sceneType;
     private Boolean viewAuth;
     private Boolean editAuth;
+
+    private String webSite;
+
+    public String getWebSite() {
+        if(StringUtils.isNotBlank(num) && sceneType != null) {
+            if(NumTypeUtils.isLaser(sceneType)){
+                if(CacheUtil.environment.contains("prod")){
+                    return CacheUtil.laserWebsite + "/index.html?m="+num;
+                }
+                return CacheUtil.laserWebsite + "/uat/index.html?m="+num;
+            }else {
+                return CacheUtil.meshWebsite + "/spg.html?m="+num;
+            }
+        }
+        return webSite;
+    }
 }

src/main/java/com/fdkankan/fusion/response/SceneVo.java

@@ -2,6 +2,7 @@ package com.fdkankan.fusion.response;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fdkankan.fusion.common.FilePath;
+import com.fdkankan.fusion.common.util.NumTypeUtils;
 import com.fdkankan.fusion.config.CacheUtil;
 import com.fdkankan.fusion.entity.Model;
 import lombok.Data;
@@ -50,6 +51,7 @@ public class SceneVo extends Model {
     private String surveillancePath;
     private String sceneJsonPath;
     private String sourceName;
+    private String webSite;
 
 
     public String getCutModelPath() {
@@ -72,4 +74,18 @@ public class SceneVo extends Model {
         }
         return sceneJsonPath;
     }
+
+    public String getWebSite() {
+        if(StringUtils.isNotBlank(num) && type != null) {
+            if(NumTypeUtils.isLaser(type)){
+                if(CacheUtil.environment.contains("prod")){
+                    return CacheUtil.laserWebsite + "/index.html?m="+num;
+                }
+                return CacheUtil.laserWebsite + "/uat/index.html?m="+num;
+            }else {
+                return CacheUtil.meshWebsite + "/spg.html?m="+num;
+            }
+        }
+        return webSite;
+    }
 }

src/main/java/com/fdkankan/fusion/service/impl/SceneService.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.ResultCode;
+import com.fdkankan.fusion.common.util.CameraUtil;
 import com.fdkankan.fusion.common.util.FileWriterUtil;
 import com.fdkankan.fusion.common.util.RedisKeyUtil;
 import com.fdkankan.fusion.common.util.ShellUtil;
@@ -104,6 +105,7 @@ public class SceneService implements ISceneService {
                 sceneVo.setDeptName(tmDepartment.getName());
             }
             sceneVo.setStatus(setLaserStatus(sceneVo.getStatus(),sceneVo.getPayStatus()));
+            sceneVo.setType(CameraUtil.getTypeByCameraType(sceneVo.getCameraType(),sceneVo.getIsObj()));
             if(modelingMap.get(sceneVo.getNum()) != null && !modelingMap.get(sceneVo.getNum())){
                 sceneVo.setStatus(5);
             }

src/main/resources/application-localprod.yaml

@@ -37,23 +37,23 @@ spring:
 4dkk:
   laserService:
     #深时（激光）地址 生产环境：https://laser.4dkankan.com/
-    basePath: http://laser.4dkankan.com/backend
+    basePath: https://laser.4dkankan.com
     port: 80
     #basePath: http://192.168.0.152:8080
     #port: 8080
   fdService:
     #官网生产环境：https://www.4dkankan.com      http://test.4dkankan.com
-    basePath: http://www.4dkankan.com
+    basePath: https://www.4dkankan.com
     port: 80
     #basePath: http://192.168.0.38/4dkankan_v2
     #port: 8080
   newFdService:
     #官网生产环境：https://www.4dkankan.com
-    basePath: http://www.4dkankan.com
+    basePath: https://www.4dkankan.com
     port: 80
   overallService:
     #全景看看生产环境 host: https://www.4dkankan.com/qjkankan
-    basePath: http://test.4dkankan.com/qjkankan
+    basePath: https://test.4dkankan.com/qjkankan
     port: 80
   takeLookService:
     basePath: https://www.4dkankan.com

src/main/resources/application-prod.yaml

@@ -34,23 +34,23 @@ spring:
 4dkk:
   laserService:
     #深时（激光）地址 生产环境：https://laser.4dkankan.com/
-    basePath: http://laser.4dkankan.com/backend
+    basePath: https://laser.4dkankan.com
     port: 80
     #basePath: http://192.168.0.152:8080
     #port: 8080
   fdService:
     #官网生产环境：https://www.4dkankan.com      http://test.4dkankan.com
-    basePath: http://www.4dkankan.com
+    basePath: https://www.4dkankan.com
     port: 80
     #basePath: http://192.168.0.38/4dkankan_v2
     #port: 8080
   newFdService:
     #官网生产环境：https://www.4dkankan.com
-    basePath: http://www.4dkankan.com
+    basePath: https://www.4dkankan.com
     port: 80
   overallService:
     #全景看看生产环境 host: https://www.4dkankan.com/qjkankan
-    basePath: http://test.4dkankan.com/qjkankan
+    basePath: https://test.4dkankan.com/qjkankan
     port: 80
   takeLookService:
     basePath: https://www.4dkankan.com

src/main/resources/application-test.yaml

@@ -35,23 +35,23 @@ spring:
 4dkk:
   laserService:
     #深时（激光）地址 生产环境：https://laser.4dkankan.com/
-    basePath: http://uat-laser.4dkankan.com
+    basePath: https://uat-laser.4dkankan.com
     port: 80
     #basePath: http://192.168.0.152:8080
     #port: 8080
   fdService:
     #官网生产环境：https://www.4dkankan.com      http://test.4dkankan.com
-    basePath: http://test.4dkankan.com
+    basePath: https://test.4dkankan.com
     port: 80
     #basePath: http://192.168.0.38/4dkankan_v2
     #port: 8080
   newFdService:
     #官网生产环境：https://www.4dkankan.com
-    basePath: http://v4-test.4dkankan.com
+    basePath: https://v4-test.4dkankan.com
     port: 80
   overallService:
     #全景看看生产环境 host: https://www.4dkankan.com/qjkankan
-    basePath: http://test.4dkankan.com/qjkankan
+    basePath: https://test.4dkankan.com/qjkankan
   takeLookService:
     basePath: https://v4-test.4dkankan.com
     port: 80