bug-40617

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

@@ -6,6 +6,7 @@ import com.fdkankan.scene.config.ServiceConfig;
 import com.fdkankan.scene.oss.aliyun.AliyunOssTemplate;
 import com.fdkankan.scene.oss.minio.MinioOssTemplate;
 import com.fdkankan.scene.util.CmdBuildUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Base64Utils;
@@ -20,7 +21,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.stream.Collectors;
 
-
+@Slf4j
 @Component
 public class OssUtil {
 

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

@@ -374,6 +374,8 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         sceneEditInfoExt = sceneEditInfoExtService.getByEditInfoId(sceneEditInfo.getId());
 
         //生成sceneJson
+        String sceneJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH+"scene.json", num);
+        String oldSceneJson = ossUtil.getFileContent(bucket, sceneJsonPath);
         SceneJsonBean sceneJson = new SceneJsonBean();
         BeanUtil.copyProperties(sceneEditInfoExt, sceneJson);
         BeanUtil.copyProperties(sceneEditInfo, sceneJson);
@@ -389,8 +391,11 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
             sceneJson.setVideos(scenePlusExt.getVideos());
         }
         sceneJson.setModelKind(scenePlusExt.getModelKind());
+        if(StrUtil.isNotEmpty(oldSceneJson)){
+            List<JSONObject> mosaicList = JSON.parseObject(oldSceneJson, SceneJsonBean.class).getMosaicList();
+            sceneJson.setMosaicList(mosaicList);
+        }
         //本地写sceneJson文件
-        String sceneJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH+"scene.json", num);
         ossUtil.uploadFileBytes(bucket, sceneJsonPath, JSON.toJSONString(sceneJson).getBytes(StandardCharsets.UTF_8));
 
         //生成floorplan.json