Merge branch 'hotfix-30089-20220812' into test

# Conflicts:
#	src/main/java/com/fdkankan/repair/service/impl/SceneUpgradeToV4Service.java

src/main/java/com/fdkankan/repair/controller/SceneRepairController.java

@@ -264,6 +264,9 @@ public class SceneRepairController {
                 ScenePlusExt scenePlusExt = scenePlusExtService.getOne(
                     new LambdaQueryWrapper<ScenePlusExt>()
                         .eq(ScenePlusExt::getPlusId, scenePlus.getId()));
+                if(StrUtil.isNotEmpty(scenePlusExt.getSceneKind())){
+                    continue;
+                }
                 if(SceneResolution.TILES.code().equals(scenePlusExt.getSceneResolution())){
                     scenePlusExt.setSceneKind(SceneKind.FACE.code());
                 }else{

src/main/java/com/fdkankan/repair/service/impl/SceneUpgradeToV4Service.java

@@ -3,6 +3,7 @@ package com.fdkankan.repair.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.exceptions.ExceptionUtil;
+import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -266,12 +267,11 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
 
                 sceneEditInfo.setTitle(scenePro.getSceneName());
                 sceneEditInfo.setVersion(sceneEditInfo.getVersion() + 1);
-                //如果是重算升级，需要重置平面图标识为否
-                if(reUpgrade){
-                    sceneEditInfo.setFloorPlanUser(CommonStatus.NO.code().intValue());
-                }
+
                 if(reUpgrade){//场景重算再掉的升级时，需要把imgVersion累加
                     sceneEditInfo.setImgVersion(sceneEditInfo.getImgVersion() + 1);
+                    //如果是重算升级，需要重置平面图标识为否
+                    sceneEditInfo.setFloorPlanUser(CommonStatus.NO.code().intValue());
                 }
                 sceneEditInfoService.updateById(sceneEditInfo);
 
@@ -383,8 +383,12 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
                 uploadToOssUtil.copyFiles(imagePath + "floorLogoImg.png", viewUsersPath + "floorLogo-user.png");
             }
             if("user".equals(sceneProEdit.getBgMusic())){
-                uploadToOssUtil.copyFiles(imagePath + sceneProEditExt.getBgMusicName(), editUsersPath + "music-user.mp3");
-                uploadToOssUtil.copyFiles(imagePath + sceneProEditExt.getBgMusicName(), viewUsersPath + "music-user.mp3");
+                String extName = "mp3";
+                if(StrUtil.isNotEmpty(sceneProEditExt.getBgMusicName())){
+                    extName = cn.hutool.core.io.FileUtil.extName(sceneProEditExt.getBgMusicName());
+                }
+                uploadToOssUtil.copyFiles(imagePath + sceneProEditExt.getBgMusicName(), editUsersPath + "music-user" + extName);
+                uploadToOssUtil.copyFiles(imagePath + sceneProEditExt.getBgMusicName(), viewUsersPath + "music-user" + extName);
             }
             if(existLoadingLogo){
                 uploadToOssUtil.copyFiles(imagePath + "logo-main.png", editUsersPath + "loadingLogo-user.png");