|
|
@@ -102,7 +102,7 @@ public class LaserService implements ILaserService {
|
|
|
this.downloadFile(laserResourceUrl+key,sourceLocal+
|
|
|
File.separator+num+
|
|
|
File.separator+"www"+
|
|
|
- File.separator+datum.getSceneCode()+srcPath);
|
|
|
+ File.separator+num+srcPath);
|
|
|
}
|
|
|
}else{
|
|
|
String srcPath=datum.getKey();
|
|
|
@@ -113,7 +113,7 @@ public class LaserService implements ILaserService {
|
|
|
}
|
|
|
break;
|
|
|
case 3:
|
|
|
- if (os instanceof WindowsOperatingSystem){
|
|
|
+// if (os instanceof WindowsOperatingSystem){
|
|
|
String path = datum.getKey();
|
|
|
if (datum.getKey().startsWith("/")) {
|
|
|
path = path.substring(1);
|
|
|
@@ -124,9 +124,9 @@ public class LaserService implements ILaserService {
|
|
|
continue;
|
|
|
}
|
|
|
this.downloadFile(laserResourceUrl+key,sourceLocal+
|
|
|
- File.separator+datum.getSceneCode()+
|
|
|
+ File.separator+num+
|
|
|
File.separator+"www"+
|
|
|
- File.separator+datum.getSceneCode()+
|
|
|
+ File.separator+num+
|
|
|
File.separator+"wwwroot"+
|
|
|
File.separator+datum.getSceneCode()+
|
|
|
File.separator+"data"+
|
|
|
@@ -134,19 +134,19 @@ public class LaserService implements ILaserService {
|
|
|
File.separator+"depthmap"+
|
|
|
File.separator+FileUtil.getName(key));
|
|
|
}
|
|
|
- }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);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+// }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;
|
|
|
case 4:
|
|
|
downloadService.cutImg(datum.getSceneCode(),sourceLocal+datum.getPath(),"4k","tiles");
|
xiewj