Merge branch 'feature-v4.7.0.2-20230404' into test

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -830,6 +830,10 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 scenePlusExt.setSceneResolution(SceneResolution.four_K.code());
                 scenePlusExt.setSceneFrom(SceneFrom.LASER.code());
                 break;
+            case SG:
+                scenePlusExt.setSceneResolution(SceneResolution.four_K.code());
+                scenePlusExt.setSceneFrom(SceneFrom.LASER.code());
+                break;
         }
 
         String sceneKind = scenePlusExt.getSceneScheme() == 3 ? SceneKind.FACE.code():SceneKind.TILES.code();

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -22,6 +22,7 @@ import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.SnowflakeIdGenerator;
 import com.fdkankan.contro.constant.RedisConstants;
 import com.fdkankan.contro.entity.*;
+import com.fdkankan.contro.enums.CameraTypeEnum;
 import com.fdkankan.contro.mapper.ISceneFileBuildMapper;
 import com.fdkankan.contro.service.*;
 import com.fdkankan.contro.vo.ResponseSceneFile;
@@ -382,7 +383,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         String algorithm = jsonObject.getString("location") != null && "1".equals(jsonObject.getString("location")) ? "sfm" : "slam";
 
         ScenePlusVO scenePlusVO = this.createScenePlus(sceneNum, cameraDetail.getCameraId(), jsonObject.getString("creator"),
-                jsonObject.getString("pwd"),cameraType, dataSource, icon,  cameraDetail.getUserId(), userName,algorithm,
+                jsonObject.getString("pwd"),cameraType, jsonObject.getJSONObject("cam").getIntValue("type"),
+                dataSource, icon,  cameraDetail.getUserId(), userName,algorithm,
                 jsonObject.getJSONArray("points").size(), jsonObject.getString("name"), jsonObject.getString("info"),
                 jsonObject.getInteger("scenetype"), jsonObject.getString("gps"), rebuild,
                 jsonObject.getInteger("resolution"), firmwareVersion.toString(), sceneUrl, buildType, cameraDetail.getCooperationUser());
@@ -773,7 +775,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     }
 
     public ScenePlusVO createScenePlus(String projectNum, Long cameraId, String phoneId, String sceneKey,
-                                     Long cameraType, String dataSource, String pic, Long userId, String userName,
+                                     Long cameraType, int camType, String dataSource, String pic, Long userId, String userName,
                                      String algorithm, Integer sceneShootCount, String sceneName,
                                      String sceneDec, Integer sceneType, String gps,Integer type,
                                      Integer resolution, String firmwareVersion, String url, String buildType,
@@ -786,25 +788,28 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         scenePlus.setCameraId(cameraId);
         scenePlus.setPhoneId(phoneId);
         scenePlus.setNum(projectNum);
-        scenePlus.setSceneSource(1);
+        scenePlus.setSceneSource(SceneSource.BM.code());
         scenePlusExt.setDataSource(dataSource);
 
         if(resolution == null || resolution.intValue() == 0){
             scenePlusExt.setSceneScheme(cameraType.intValue());
         }else {
-            scenePlusExt.setSceneScheme(4);
+            scenePlusExt.setSceneScheme(SceneScheme.BM.code());
         }
 
         //转台相机用4k图
-        if(cameraType.longValue() == 13 ){
-            scenePlus.setSceneSource(3);
-            scenePlusExt.setSceneScheme(10);
+        if(cameraType.longValue() == 13){
+            scenePlus.setSceneSource(SceneSource.ZT.code());
+            scenePlusExt.setSceneScheme(SceneScheme.FOUR_K.code());
         }
 
         //激光相机
-        if(cameraType.longValue() == 14 ){
-            scenePlus.setSceneSource(4);
-            scenePlusExt.setSceneScheme(10);
+        if(cameraType.longValue() == 14){
+            scenePlus.setSceneSource(SceneSource.JG.code());
+            scenePlusExt.setSceneScheme(SceneScheme.FOUR_K.code());
+            if(camType == CameraTypeEnum.LASER_SG.getType()){
+                scenePlus.setSceneSource(SceneSource.SG.code());
+            }
         }
 
         if(ModelKind.THREE_D_TILE.code().equals(modelKind)