|
@@ -395,6 +395,8 @@ public class CaseDownService {
|
|
|
}
|
|
|
@Value("${upload.query-path}")
|
|
|
private String queryPath;
|
|
|
+ @Value("${upload.query-path-ss}")
|
|
|
+ private String ssQueryPath;
|
|
|
public void downZip(Integer type ,String uri,String kkzipPath,String kknumPath,String sszipPath,String ssNumPath){
|
|
|
try {
|
|
|
if(type != 2 && type != 5){ //深时点云
|
|
@@ -402,21 +404,12 @@ public class CaseDownService {
|
|
|
uri = uri.split("[?]")[0];
|
|
|
}
|
|
|
ShellUtil.yunDownload(uri.replace(queryPath, ""), kkzipPath);
|
|
|
-
|
|
|
ShellUtil.unZip(kkzipPath,kknumPath);
|
|
|
FileUtil.del(kkzipPath);
|
|
|
}else {
|
|
|
-// InputStream in = minIoUploadService.getObject(uri);
|
|
|
-// FileOutputStream out = new FileOutputStream(sszipPath);
|
|
|
-// byte[] buffer = new byte[1024];
|
|
|
-// int bytesRead;
|
|
|
-// while ((bytesRead = in.read(buffer)) != -1) {
|
|
|
-// out.write(buffer, 0, bytesRead);
|
|
|
-// }
|
|
|
-// out.flush();
|
|
|
-// out.close();
|
|
|
-// in.close();
|
|
|
- ShellUtil.yunDownloadSs(uri.replace(queryPath, ""), sszipPath);
|
|
|
+ // {"msg":"操作成功","code":200,"data":{"status":1,"
|
|
|
+ // url":"https://laser-oss.4dkankan.com/testdata/SS-t-bY7NMQYlm6v/data/SS-t-bY7NMQYlm6v_offline18826401790
|
|
|
+ ShellUtil.yunDownloadSs(uri.replace(ssQueryPath, ""), sszipPath);
|
|
|
ShellUtil.unZip(sszipPath,ssNumPath);
|
|
|
FileUtil.del(sszipPath);
|
|
|
}
|