Browse Source

测试激光

xiewj 1 year ago
parent
commit
7a7956707e

+ 1 - 3
src/main/java/com/fdkankan/download/service/impl/LaserService.java

@@ -84,8 +84,7 @@ public class LaserService  implements ILaserService {
 
 
                 List<OfflineDTO> data = resultData.getData();
                 List<OfflineDTO> data = resultData.getData();
                 List<OfflineDTO> dataDetails = Collections.synchronizedList(data);
                 List<OfflineDTO> dataDetails = Collections.synchronizedList(data);
-                synchronized(dataDetails) {
-                    data.parallelStream().forEach(datum -> {
+                data.parallelStream().forEach(datum -> {
                         //1 json   ,2下载,3深度图 ,4全景图
                         //1 json   ,2下载,3深度图 ,4全景图
                         switch (datum.getType()) {
                         switch (datum.getType()) {
                             case 1:
                             case 1:
@@ -166,7 +165,6 @@ public class LaserService  implements ILaserService {
                                 break;
                                 break;
                         }
                         }
                     });
                     });
-                }
                 String path=sourceLocal+File.separator+num;
                 String path=sourceLocal+File.separator+num;
 
 
                 //处理html的编码
                 //处理html的编码

+ 2 - 1
src/main/java/com/fdkankan/download/util/DownloadUtil.java

@@ -1,5 +1,6 @@
 package com.fdkankan.download.util;
 package com.fdkankan.download.util;
 
 
+import cn.hutool.core.util.RuntimeUtil;
 import com.fdkankan.common.util.CmdUtils;
 import com.fdkankan.common.util.CmdUtils;
 
 
 /**
 /**
@@ -11,6 +12,6 @@ public class DownloadUtil {
 
 
     public static void downFile(String url, String path) throws Exception {
     public static void downFile(String url, String path) throws Exception {
         String cmd = WGET_CMD.replace("@out",path).replace("@url",url);
         String cmd = WGET_CMD.replace("@out",path).replace("@url",url);
-        CmdUtils.callLineSh(cmd);
+        RuntimeUtil.exec(cmd);
     }
     }
 }
 }