调用V4

src/main/java/com/fdkankan/fusion/httpClient/address/FdkkAddressSource.java

@@ -12,11 +12,9 @@ public class FdkkAddressSource implements AddressSource {
     @Value("${4dkk.fdService.basePath}")
     private String basePath;
 
-    @Value("${4dkk.fdService.port}")
-    private String port;
 
     @Override
     public ForestAddress getAddress(ForestRequest forestRequest) {
-        return new ForestAddress("","",Integer.valueOf(port),basePath);
+        return new ForestAddress("","",null,basePath);
     }
 }

src/main/java/com/fdkankan/fusion/httpClient/address/LaserAddressSource.java

@@ -12,11 +12,9 @@ public class LaserAddressSource implements AddressSource {
     @Value("${4dkk.laserService.basePath}")
     private String basePath;
 
-    @Value("${4dkk.laserService.port}")
-    private String port;
 
     @Override
     public ForestAddress getAddress(ForestRequest forestRequest) {
-        return new ForestAddress("","",Integer.valueOf(port),basePath);
+        return new ForestAddress("","",null,basePath);
     }
 }

src/main/java/com/fdkankan/fusion/httpClient/address/NewFdkkAddressSource.java

@@ -12,11 +12,9 @@ public class NewFdkkAddressSource implements AddressSource {
     @Value("${4dkk.newFdService.basePath}")
     private String basePath;
 
-    @Value("${4dkk.newFdService.port}")
-    private String port;
 
     @Override
     public ForestAddress getAddress(ForestRequest forestRequest) {
-        return new ForestAddress("","",Integer.valueOf(port),basePath);
+        return new ForestAddress("","",null,basePath);
     }
 }

src/main/java/com/fdkankan/fusion/httpClient/address/OverallAddressSource.java

@@ -12,11 +12,9 @@ public class OverallAddressSource implements AddressSource {
     @Value("${4dkk.overallService.basePath}")
     private String basePath;
 
-    @Value("${4dkk.overallService.port}")
-    private String port;
 
     @Override
     public ForestAddress getAddress(ForestRequest forestRequest) {
-        return new ForestAddress("","",Integer.valueOf(port),basePath);
+        return new ForestAddress("","",null,basePath);
     }
 }

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

@@ -90,11 +90,16 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
                 model.setModelDateType("obj");
                 model.setType(param.getType());
                 model.setModelType("pointcloud");    //深时点云类型
-                if(param.getType() != 2){           //不为深时
+                if(param.getType() == 0 || param.getType() == 1){           //看看，看见
                     model.setModelObjUrl(String.format(FilePath.OBJ_LOCAL_PATH,environment ,num) +"/mesh.obj");
                     model.setModelGlbUrl(getGlbUrl(param.getType(),num,model));
                     model.setModelType("glb");
                 }
+                if(param.getType() == 4){   //深时obj场景
+                   // model.setModelObjUrl(); todo
+                    //model.setModelObjUrl();
+                    model.setModelType("glb");
+                }
                 model.setNum(num);
                 model.setCreateStatus(1);
                 modelList.add(model);

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

@@ -45,7 +45,7 @@ public class SceneService implements ISceneService {
         }
         List<SceneVo> sceneVoList = new ArrayList<>();
         long total = 0;
-        if(param.getType() == 0 || param.getType() == 1){      //看看，看见
+        if(param.getType() == 0 || param.getType() == 1 || param.getType() == 4){      //看看，看见 ,深时obj
             //获取四维(看看，看见)场景数据
             FdkkResponse fdkkResponse = null;
             if(param.getNumList() == null || param.getNumList().size()<=0){

src/main/resources/application-test.yaml

@@ -37,7 +37,7 @@ spring:
     #port: 8080
   fdService:
     #官网生产环境：https://www.4dkankan.com      http://test.4dkankan.com
-    basePath: http://test.4dkankan.com
+    basePath: https://v4-uat.4dkankan.com
     port: 80
     #basePath: http://192.168.0.38/4dkankan_v2
     #port: 8080