1

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

@@ -28,6 +28,8 @@ public class FusionApplication  implements CommandLineRunner {
     private String laserWebsite;
     @Value("${4dkk.fdService.basePath}")
     private String meshWebsite;
+    @Value("${upload.query-path-ss}")
+    private String ssQueryPath;
     public static void main(String[] args) {
         SpringApplication.run(FusionApplication.class, args);
     }
@@ -39,6 +41,7 @@ public class FusionApplication  implements CommandLineRunner {
         CacheUtil.environment = environment;
         CacheUtil.laserWebsite = laserWebsite;
         CacheUtil.meshWebsite = meshWebsite;
+        CacheUtil.ssQueryPath = ssQueryPath;
 
     }
 }

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

@@ -3,6 +3,7 @@ package com.fdkankan.fusion.config;
 public class CacheUtil {
     public static String uploadType;
     public static String queryPath;
+    public static String ssQueryPath;
     public static String basePath ="/mnt/";
     public static String environment;
     public static String laserWebsite;

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

@@ -367,16 +367,15 @@ public class CaseDownService {
    }
    public void downZip(Integer type ,String uri,String kkzipPath,String kknumPath,String sszipPath,String ssNumPath){
        try {
-           if(type != 2 && type != 5){ //深时点云
-               if(uri.contains("?")){
-                   uri = uri.split("[?]")[0];
-               }
+           if(uri.contains("?")){
+               uri = uri.split("[?]")[0];
+           }
+           if(!NumTypeUtils.isLaser(type)){
                ShellUtil.yunDownload(uri.replace(CacheUtil.queryPath, ""), kkzipPath);
                ShellUtil.unZip(kkzipPath,kknumPath);
                MyFileUtil.delFile(kkzipPath);
-
            }else {
-               ShellUtil.yunDownloadSs(uri.replace(CacheUtil.queryPath, ""), sszipPath);
+               ShellUtil.yunDownloadSs(uri.replace(CacheUtil.ssQueryPath, ""), sszipPath);
                ShellUtil.unZip(sszipPath,ssNumPath);
                MyFileUtil.delFile(sszipPath);
 

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

@@ -407,12 +407,12 @@ public class FusionDownService {
            if(uri.contains("?")){
                uri = uri.split("[?]")[0];
            }
-           if(!NumTypeUtils.isLaser(type)){ //深时点云
+           if(!NumTypeUtils.isLaser(type)){
                ShellUtil.yunDownload(uri.replace(CacheUtil.queryPath, ""), kkzipPath);
                ShellUtil.unZip(kkzipPath,kknumPath);
                ShellUtil.delFile(kkzipPath);
            }else {
-               ShellUtil.yunDownloadSs(uri.replace(CacheUtil.queryPath, ""), sszipPath);
+               ShellUtil.yunDownloadSs(uri.replace(CacheUtil.ssQueryPath, ""), sszipPath);
                ShellUtil.unZip(sszipPath,ssNumPath);
                ShellUtil.delFile(sszipPath);
            }