|
@@ -15,6 +15,7 @@ import com.fdkankan.common.constant.UploadFilePath;
|
|
|
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.fyun.oss.UploadToOssUtil;
|
|
|
import com.fdkankan.redis.constant.RedisKey;
|
|
|
import com.fdkankan.redis.constant.RedisLockKey;
|
|
@@ -60,6 +61,7 @@ import java.util.Map;
|
|
|
import java.util.Map.Entry;
|
|
|
import java.util.Set;
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
+import java.util.stream.Collectors;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
@@ -289,17 +291,22 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
|
|
|
this.copyFileOss(num, completeCnt, count, voiceKeys, voicePath, voiceViewPath);
|
|
|
|
|
|
|
|
|
- //全景图上传、球幕视频
|
|
|
+
|
|
|
+ String visionPath = path + "/results/vision.txt";
|
|
|
+ List<String> panoramaImageList = SceneUtil.getPanoramaImageList(visionPath);
|
|
|
+ //全景图上传
|
|
|
Map<String, String> map = new HashMap<>();
|
|
|
String sceneNumPAth = String.format("scene/%s", num);
|
|
|
List<String> imagesList = FileUtil.getFileList(path + "/caches/images");
|
|
|
if(CollUtil.isNotEmpty(imagesList)){
|
|
|
imagesList.stream().forEach(str -> {
|
|
|
- if(str.endsWith(".jpg")){
|
|
|
+ String filePath = str.substring(str.lastIndexOf(File.separator) + 1);
|
|
|
+ if(panoramaImageList.contains(filePath)){
|
|
|
map.put(str, str.replace(path, sceneNumPAth));
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
+// 上传球幕视频
|
|
|
// List<String> videosList = FileUtil.getFileList(path + "/caches/videos");
|
|
|
// if(CollUtil.isNotEmpty(videosList)){
|
|
|
// videosList.stream().forEach(str -> map.put(str, str.replace(path, sceneNumPAth)));
|