Merge branch 'project-jmga-2.2.0-2.0.1' into project-jmga-dev

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

@@ -343,7 +343,11 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         String path = message.getPath();
         boolean status = false;
         String batchIds = (String) message.getExt().get("batchId");
-        Long sceneOrigBdId = (Long)message.getExt().get("sceneOrigBdId");
+        Object sceneOrigBdIdObj = message.getExt().get("sceneOrigBdId");
+        Long sceneOrigBdId = null;
+        if(sceneOrigBdIdObj != null){
+            sceneOrigBdId = Long.valueOf(sceneOrigBdIdObj.toString());
+        }
         Long count = redisUtil.decr("modeling-count:" + sceneCode, 1);
         log.info("场景:{},剩余计算次数：{}", sceneCode, count);
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneCode);

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

@@ -1749,7 +1749,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         mqMessage.getExt().put("customUserId", customUserId);
         mqMessage.getExt().put("gps", jsonObject.getString("gps"));
         mqMessage.getExt().put("threeCamType", scenePlusVO.getThreeCamType());
-        mqMessage.getExt().put("sceneOrigBdId", jsonObject.getInteger("sceneOrigBdId"));
+        mqMessage.getExt().put("sceneOrigBdId", jsonObject.getLong("sceneOrigBdId"));
 
         if(uploadType.equals("single")){//场景上传模式（single-细小文件上传， zip-压缩包上传）
             OrigFileUploadBatch condition = new OrigFileUploadBatch();