场景关联

src/main/java/com/fdkankan/scene/oss/OssUtil.java

@@ -294,6 +294,20 @@ public class OssUtil {
         }
     }
 
+    public Boolean copyDir(String prefix, String oldPath, String newPath) {
+        if (FdkkLaserConfig.isBucket()) {
+            if (FdkkLaserConfig.isLocalization()) {
+                return minioOssTemplate.copyObject(oldPath, newPath);
+            } else {
+                return aliyunOssTemplate.copyObject(oldPath, newPath);
+            }
+        }else{
+            File copy = FileUtil.copyContent(new File(FdkkLaserConfig.getProfile(prefix) + File.separator + oldPath),
+                    new File(FdkkLaserConfig.getProfile(prefix) + File.separator + newPath), true);
+            return copy.exists();
+        }
+    }
+
 
     public Boolean copyObject(String bucket, String oldPath, String toBucket, String newPath) {
         if (FdkkLaserConfig.isBucket()) {

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -64,7 +64,7 @@ import java.util.stream.Collectors;
  *  服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2022-01-18
  */
 @Slf4j
@@ -238,7 +238,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         this.publicHotData(num, bucket);
 
         //发布场景关联相关数据
-//        this.publicLinkSceneData(num, bucket);
+        this.publicLinkSceneData(num, bucket);
 
         //发布滤镜数据
         this.publicFilterData(num, sceneEditInfoExt.getFilters(), bucket);
@@ -343,7 +343,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
         //拷贝编辑目录到发布目录
         ossUtil.deleteObject(bucket,imgViewPath + "panorama");
-        ossUtil.copyObject(bucket, imgEditPath + "panorama", imgViewPath + "panorama");
+        ossUtil.copyDir(bucket, imgEditPath + "panorama", imgViewPath + "panorama");
 
     }
 
@@ -1897,7 +1897,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
         String bucket = scenePlusExt.getYunFileBucket();
 
-        String localImagesPath = String.format(ConstantFilePath.IMAGESBUFFER_FORMAT, num);
+//        String localImagesPath = String.format(ConstantFilePath.IMAGESBUFFER_FORMAT, num);
+        String localImagesPath = sceneService.getDataSource(num, scenePlus.getSceneSource(), scenePlusExt.getDataSource()) + "linkPan" + File.separator;
         String path = scenePlusExt.getDataSource();
         String target = localImagesPath + "panorama/" + sid;
         FileUtils.deleteDirectory(target);
@@ -1941,13 +1942,13 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
                 skyboxType = "SKYBOX_V7";
                 type = "2k";
             }
-            if(scenePlusExt.getSceneScheme() == 3){
+//            if(scenePlusExt.getSceneScheme() == 3){
                 if("4k".equals(scenePlusExt.getSceneResolution())){
                     skyboxType = "SKYBOX_V14";
                 }else{
                     skyboxType = "SKYBOX_V13";
                 }
-            }
+//            }
             dataJson.put("skybox_type", skyboxType);
 
             cn.hutool.core.io.FileUtil.writeString(dataJson.toString(), target + File.separator+"data.json", StandardCharsets.UTF_8);