|
@@ -121,7 +121,6 @@ public class LaserService implements ILaserService {
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
case 3:
|
|
case 3:
|
|
|
-// if (os instanceof WindowsOperatingSystem){
|
|
|
|
|
String path = datum.getKey();
|
|
String path = datum.getKey();
|
|
|
if (datum.getKey().startsWith("/")) {
|
|
if (datum.getKey().startsWith("/")) {
|
|
|
path = path.substring(1);
|
|
path = path.substring(1);
|
|
@@ -131,6 +130,7 @@ public class LaserService implements ILaserService {
|
|
|
if (StrUtil.isEmpty(FileUtil.extName(key)) || FileUtil.extName(key).equalsIgnoreCase("ply")) {
|
|
if (StrUtil.isEmpty(FileUtil.extName(key)) || FileUtil.extName(key).equalsIgnoreCase("ply")) {
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
|
|
+ if (path.contains("depthmap")) {
|
|
|
downloadUtil.downloadFile(laserResourceUrl + key, sourceLocal +
|
|
downloadUtil.downloadFile(laserResourceUrl + key, sourceLocal +
|
|
|
File.separator + num +
|
|
File.separator + num +
|
|
|
File.separator + "www" +
|
|
File.separator + "www" +
|
|
@@ -141,20 +141,24 @@ public class LaserService implements ILaserService {
|
|
|
File.separator + datum.getSceneCode() +
|
|
File.separator + datum.getSceneCode() +
|
|
|
File.separator + "depthmap" +
|
|
File.separator + "depthmap" +
|
|
|
File.separator + FileUtil.getName(key),1);
|
|
File.separator + FileUtil.getName(key),1);
|
|
|
|
|
+ }else if (path.contains("imagemap")){
|
|
|
|
|
+ downloadUtil.downloadFile(laserResourceUrl + key, sourceLocal +
|
|
|
|
|
+ File.separator + num +
|
|
|
|
|
+ File.separator + "www" +
|
|
|
|
|
+ File.separator + num +
|
|
|
|
|
+ File.separator + "datav1" +
|
|
|
|
|
+ File.separator + num +
|
|
|
|
|
+ File.separator + "data" +
|
|
|
|
|
+ File.separator + datum.getSceneCode() +
|
|
|
|
|
+ File.separator + "imagemap" +
|
|
|
|
|
+ File.separator + FileUtil.getName(key),1);
|
|
|
|
|
+// String srcPath = datum.getKey();
|
|
|
|
|
+// if ("/".equals(datum.getKey().substring(0, 1))) {
|
|
|
|
|
+// srcPath = srcPath.substring(1);
|
|
|
|
|
+// }
|
|
|
|
|
+// fYunFileService.downloadFileByCommand(bucket, sourceLocal + datum.getPath(), srcPath);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
-// }else{
|
|
|
|
|
-// String srcPath=datum.getKey();
|
|
|
|
|
-// if("/".equals(datum.getKey().substring(0,1))){
|
|
|
|
|
-// srcPath = srcPath.substring(1);
|
|
|
|
|
-// }
|
|
|
|
|
-// fYunFileService.downloadFileByCommand(bucket,sourceLocal+datum.getPath(),srcPath);
|
|
|
|
|
-// File[] deptLs = FileUtil.ls(sourceLocal+datum.getPath());
|
|
|
|
|
-// for (File dept : deptLs) {
|
|
|
|
|
-// if (FileUtil.extName(dept).equalsIgnoreCase("ply")){
|
|
|
|
|
-// FileUtil.del(dept);
|
|
|
|
|
-// }
|
|
|
|
|
-// }
|
|
|
|
|
-// }
|
|
|
|
|
break;
|
|
break;
|
|
|
case 4:
|
|
case 4:
|
|
|
try {
|
|
try {
|
|
@@ -192,6 +196,8 @@ public class LaserService implements ILaserService {
|
|
|
File file=offlineZip(path,zipPath);
|
|
File file=offlineZip(path,zipPath);
|
|
|
log.info("生成完成路径{}",file.getAbsoluteFile());
|
|
log.info("生成完成路径{}",file.getAbsoluteFile());
|
|
|
return zipPath;
|
|
return zipPath;
|
|
|
|
|
+ }else {
|
|
|
|
|
+ log.info("laser场景不存在,num:{}", resultData.getMsg());
|
|
|
}
|
|
}
|
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
|
log.error("laser场景下载报错,num:{}", num, e);
|
|
log.error("laser场景下载报错,num:{}", num, e);
|