深光相机slam模式

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

@@ -394,7 +394,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             fYunFileService.uploadFile(localDataPath + "status.json", dataViewPath + "status.json");
         }
 
-        BuildSceneCallMessage mqMessage = getBuildSceneMqMessage(sceneNum, cameraType, algorithm, jsonObject.getInteger("resolution"), buildType,
+        BuildSceneCallMessage mqMessage = getBuildSceneMqMessage(sceneNum, cameraType, algorithm, jsonObject, buildType,
                 scenePlusVO.getDataSource());
 
         if (cameraDetail.getCompanyId() != null) {
@@ -482,7 +482,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             FileUtils.writeFile(localDataPath + "status.json", statusJson.toString());
             fYunFileService.uploadFile(localDataPath + "status.json", dataViewPath + "status.json");
         }
-        BuildSceneCallMessage mqMessage = getBuildSceneMqMessage(sceneNum, cameraType, algorithm, jsonObject.getInteger("resolution"), buildType,
+        BuildSceneCallMessage mqMessage = getBuildSceneMqMessage(sceneNum, cameraType, algorithm, jsonObject, buildType,
                 scenePlusVO.getDataSource());
         if (cameraDetail.getCompanyId() != null) {
             Company company = companyService.getById(cameraDetail.getCompanyId());
@@ -1081,17 +1081,19 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     }
 
     public BuildSceneCallMessage getBuildSceneMqMessage(String projectNum,
-                                                        Long cameraType, String algorithm, Integer resolution,
+                                                        Long cameraType, String algorithm, JSONObject fdageJson,
                                                         String buildType, String dataSource) {
         BuildSceneCallMessage mqMsg = new BuildSceneCallMessage();
         mqMsg.setSceneNum(projectNum);
         mqMsg.setCameraType(String.valueOf(cameraType));
         mqMsg.setAlgorithm(algorithm);
-        mqMsg.setResolution(String.valueOf(resolution));
+        mqMsg.setResolution(String.valueOf(fdageJson.getInteger("resolution")));
         mqMsg.setBuildType(buildType);
         mqMsg.setPath(dataSource);
         mqMsg.setCreateTime(DateUtil.format(Calendar.getInstance().getTime(), DateExtUtil.dateStyle));
-        mqMsg.setExt(new HashMap<>());
+        Map<String, Object> ext = new HashMap<>();
+        ext.put("location", fdageJson.getInteger("location"));
+        mqMsg.setExt(ext);
         return mqMsg;
     }
 
@@ -1174,11 +1176,11 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             message = this.getBuildSceneMqMessage(
                     num, cameraType,
                     fdageData.getString("location") != null && "1".equals(fdageData.getString("location")) ? "sfm" : "slam",
-                    fdageData.getInteger("resolution"), buildType, path);
+                    fdageData, buildType, path);
         }else{
             message = this.getBuildSceneMqMessage(
                     num, cameraType, fdageData.getString("location") != null && "1".equals(fdageData.getString("location")) ? "sfm" : "slam",
-                    fdageData.getInteger("resolution"), buildType,
+                    fdageData, buildType,
                     path);
         }
         if(deleteExtras){
@@ -1286,7 +1288,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
         BuildSceneCallMessage buildSceneMqMessage = this.getBuildSceneMqMessage(
                 num, cameraType, fdageData.getString("location") != null && "1".equals(fdageData.getString("location")) ? "sfm" : "slam",
-                fdageData.getInteger("resolution"), buildType, path);
+                fdageData, buildType, path);
         rabbitMqProducer.sendByWorkQueue(queueV3ModelingPre, buildSceneMqMessage);
 
         //重算的场景，先移除该场景对应的容量
@@ -1432,7 +1434,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
         BuildSceneCallMessage buildSceneMqMessage = this.getBuildSceneMqMessage(
                 sceneNum, cameraType, jsonObject.getString("location") != null && "1".equals(jsonObject.getString("location")) ? "sfm" : "slam",
-                jsonObject.getInteger("resolution"), buildType, dataSource);
+                jsonObject, buildType, dataSource);
         rabbitMqProducer.sendByWorkQueue(queueV3ModelingPre, buildSceneMqMessage);
 
     }