|
|
@@ -13,10 +13,7 @@ import com.fdkankan.common.constant.CommonStatus;
|
|
|
import com.fdkankan.common.constant.ConstantFilePath;
|
|
|
import com.fdkankan.common.constant.UploadFilePath;
|
|
|
import com.fdkankan.common.response.ResultData;
|
|
|
-import com.fdkankan.common.util.FileUtil;
|
|
|
-import com.fdkankan.common.util.FileUtils;
|
|
|
-import com.fdkankan.common.util.MatrixToImageWriterUtil;
|
|
|
-import com.fdkankan.common.util.SceneUtil;
|
|
|
+import com.fdkankan.common.util.*;
|
|
|
import com.fdkankan.fyun.oss.UploadToOssUtil;
|
|
|
import com.fdkankan.redis.constant.RedisKey;
|
|
|
import com.fdkankan.redis.constant.RedisLockKey;
|
|
|
@@ -302,11 +299,20 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
|
|
|
|
|
|
//将全景图缓存到缓存目录
|
|
|
try {
|
|
|
+ if (!new File(path + "/caches/images").exists()) {
|
|
|
+ String ossPath = path.replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, ConstantFilePath.OSS_PREFIX)
|
|
|
+ .replace(ConstantFilePath.BUILD_MODEL_PATH, ConstantFilePath.OSS_PREFIX);
|
|
|
+ CreateObjUtil.ossUtilCp(ossPath + "_results/caches/images/", path + File.separator + "caches/images");
|
|
|
+ }
|
|
|
List<String> imagesList = cn.hutool.core.io.FileUtil.listFileNames(path + "/caches/images");
|
|
|
String cachedImagesPath = String.format(ConstantFilePath.SCENE_CACHE_IMAGES, num);
|
|
|
//先清除旧的全景图
|
|
|
cn.hutool.core.io.FileUtil.del(cachedImagesPath);
|
|
|
String visionPath = path + "/results/vision.txt";
|
|
|
+ if (!new File(visionPath).exists()) {
|
|
|
+ CreateObjUtil.ossUtilCp(imagePath + "vision.txt", path + "/results");
|
|
|
+ }
|
|
|
+
|
|
|
List<String> panoramaImageList = SceneUtil.getPanoramaImageList(visionPath);
|
|
|
imagesList.stream().forEach(fileName -> {
|
|
|
if(panoramaImageList.contains(fileName)){
|
|
|
@@ -341,6 +347,9 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
|
|
|
String userEditPath = UploadFilePath.USER_EDIT_PATH + "floor-cad-%s.%s";
|
|
|
String userViewPath = UploadFilePath.USER_VIEW_PATH + "floor-cad-%s.%s";
|
|
|
String floorCadPath = path + "/results/floorplan_cad";
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
List<String> floorCadList = FileUtil.getFileList(floorCadPath);
|
|
|
if(CollUtil.isNotEmpty(floorCadList)){
|
|
|
floorCadList.stream().forEach(str->{
|
|
|
@@ -449,7 +458,7 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
|
|
|
uploadToOssUtil.upload(visionTxtPath, imageViewPath + "vision.txt");
|
|
|
}
|
|
|
if(cn.hutool.core.io.FileUtil.exist(vision2TxtPath)){
|
|
|
- uploadToOssUtil.upload(visionTxtPath, imageViewPath + "vision2.txt");
|
|
|
+ uploadToOssUtil.upload(vision2TxtPath, imageViewPath + "vision2.txt");
|
|
|
}
|
|
|
|
|
|
//生成scene.json
|
